Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 Jun 2019 18:55:45 +0000 (03:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 Jun 2019 18:55:45 +0000 (03:55 +0900)
commit01ba1aecf59d75dd28a542be0f1f16dcb096f511
tree55defeda2733048a7425c11d1ca4eb949d3f5d43
parent0f8ad04d6d3d69ab12cfb35b83aad11e629d5897
parent6ce6895f293930ea0f9498fdc5e03b0bc8ec022c
Merge branch 'master' into single-inheritance