Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 17 Jun 2019 14:11:15 +0000 (23:11 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 17 Jun 2019 14:11:15 +0000 (23:11 +0900)
commit2497a7d55b7d5f8ab2ab82c401d51868e2d989b8
treed57f6d6a27aa54e3a1e2d70989970dddbaca82c1
parent2129a180d9f0261c8414ebf016ce2679aead877e
parentce11d47aba900d8fa6bb45defff5c162d8b03210
Merge branch 'master' into single-inheritance