Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 27 Sep 2019 13:14:22 +0000 (22:14 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 27 Sep 2019 13:14:22 +0000 (22:14 +0900)
commite9ce8c480afe4badf423d576f6cb98d2fff0c76c
tree3853e2f9743de767a5811f45f01aaa26b10ee896
parent4d38b5f9bd953bb4ff90f5eb9dd1f354254dd4af
parentfcaac29d7d5c31e77b05ca95f60f3979cf8251e1
Merge branch 'master' into single-inheritance