Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Sep 2018 06:34:41 +0000 (15:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Sep 2018 06:34:41 +0000 (15:34 +0900)
commitf1214e8c790528c49063f0c2fec320954f4d12d0
treec757e4603ff498007fcbd2517a36924051e1fea0
parentc33829fa24e9a3d212321d51c3787368b7e074a9
parentd8f8e2d910741419e6e79f9168ecf271c6f99c5d
Merge branch 'master' into single-inheritance