Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 17 May 2018 11:34:20 +0000 (20:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 17 May 2018 11:34:20 +0000 (20:34 +0900)
commit6d63bf78bf7652b94dd62564bf1af5965c37540a
tree8ea9bdf54de5ae8cf4ce746c1e8952a32174315f
parent83b7f30f6ffa1f69b13472ab3030388e8e10f79b
parentd1772ff384b161fa884517d201956e477afad354
Merge branch 'master' into single-inheritance