Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 31 Mar 2019 15:28:32 +0000 (00:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 31 Mar 2019 15:28:32 +0000 (00:28 +0900)
commit84ab61283d54b21004e3bd3b0e6995d81d2919ca
tree51fe43037799dd236411335efe018d7bdfebe3da
parent9f3256f57c3746e92552d693813360f2f8c3d6de
parent7f1980c51321cab8b373971954c5bae618a02699
Merge branch 'master' into single-inheritance