Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 08:14:25 +0000 (17:14 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 08:14:25 +0000 (17:14 +0900)
commit36ba4a02ab1d26b3fb4c7a785def7ca626e835ae
tree7573bcae8cfee56dc350918f18e1f8a9da5fcbef
parent9b5013fc1dfd8f6de9a7e8b76def722dafbb1463
parent035f36501d654446715b294c89f2409446c57eda
Merge branch 'master' into single-inheritance