Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jan 2020 10:47:39 +0000 (19:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jan 2020 10:47:39 +0000 (19:47 +0900)
commit4a1ea1e350bb021056872059467400d0b69bf40f
treea2919d4bb04ae152badfa346aa40bc2312ef31c7
parent46418288cf17261f90706c3fa15e72a82cf262a2
parentb352de7f1e9fdd23dfa96f2d80df4e2479232504
Merge branch 'master' into single-inheritance