Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 May 2019 03:28:10 +0000 (12:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 May 2019 03:28:10 +0000 (12:28 +0900)
commitf5b022300b7fbc01aff669b05548b7e048bdb4a7
treeba9dd0afd3ced5337fa958b58c4c61bc12f77fa8
parent5c80cf11ef1f7297d44768435cd197b4e6093e35
parentb880adc08b19cec920da99a790724b9d72242a50
Merge branch 'master' into single-inheritance