Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 8 Aug 2018 12:14:43 +0000 (21:14 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 8 Aug 2018 12:14:43 +0000 (21:14 +0900)
commit101b7b1d503e37b7d3109a4c0d18f86ae4a9563d
tree073af3b1fd5fd92249224bf868211926470db89d
parent315baefdc441c9d87052475494931eb8571923c4
parentff2ee1a14534024cf8e6e9761401f79b87bad31d
Merge branch 'master' into single-inheritance