Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 3 May 2020 14:48:06 +0000 (23:48 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 3 May 2020 14:48:06 +0000 (23:48 +0900)
commit06e461fc79f0279f2aa05a1ff15558770288920b
tree1de5456215c747ed2e8a2012c053b2bc22d74998
parentb452d6aa16151f2ea757a180df959fe1f99fa193
parent545004bcb9b89a37d45e598baa1b84b266b313f5
Merge branch 'master' into single-inheritance