Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 19 Mar 2020 10:43:56 +0000 (19:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 19 Mar 2020 10:43:56 +0000 (19:43 +0900)
commit38feebee8d1b3497fd22140ff3b16a6698bf4a99
tree05f4385f8f9154881325a0170c32e42088762b8e
parenta402ebce0e09d0b5453ce64510965d7494243b7d
parentaabdcb6b9a0d95cc03d147c0bb3b3d643fa720ea
Merge branch 'master' into single-inheritance