Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 16 Dec 2020 01:00:07 +0000 (10:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 16 Dec 2020 01:00:07 +0000 (10:00 +0900)
commit1306e33a6610bd512ec34ac9b02af1c899d8af40
tree7d041d3f909e0f00e36e6585c2e7de80480810cd
parent01f45ac05d8785be1cd0ff1fa77c600f3d40b094
parent95027a5df9152111c87cef78eca18faccdb500b5
Merge branch 'master' into single-inheritance