Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jul 2020 03:01:30 +0000 (12:01 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jul 2020 03:01:30 +0000 (12:01 +0900)
commit8f1ff1423c7e9eb7d6cf9d2f1dc64f3b4cb553aa
treec9264f2176eb5ef3f991385d64fff4ff4db9965d
parent826ff8960269cfef73527a341c4a4d91ccfc6bed
parent686219cc6952005b188ae6ea00aba21c41ed87e2
Merge branch 'master' into single-inheritance