Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 07:04:24 +0000 (16:04 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 07:04:24 +0000 (16:04 +0900)
commit9b5013fc1dfd8f6de9a7e8b76def722dafbb1463
tree45e3b897fc1c8b446dd3cc661cbac2bdc04f2240
parent08a6052719f29a6c3924ed44dd14506c208791a2
parentce094de6f885804934bdb941410d8a6cbe0aa434
Merge branch 'master' into single-inheritance