Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 7 Feb 2019 11:21:33 +0000 (20:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 7 Feb 2019 11:21:33 +0000 (20:21 +0900)
commit391351d19543e02c43efa90bf3d46c981b6fe8cb
tree3dd04a8ec033e0c63c97d883a5e871ea60423aae
parent825ecc9fb3fc4123b62795b544a72a7175df3d7c
parentc70a0215eaeade8265af3793810ded29541e539a
Merge branch 'master' into single-inheritance