Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Feb 2020 13:52:26 +0000 (22:52 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Feb 2020 13:52:26 +0000 (22:52 +0900)
commit352c78601642b03e39ba562482b32a3df53569d9
tree008626336c948c7007315016ced99efde62ebe48
parentbda2f6b4d4da97d223555b84b65ade56a97a1842
parent013cd95da6aae348e9a37410d57702679e1b46d7
Merge branch 'master' into single-inheritance