Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 Jul 2019 02:48:47 +0000 (11:48 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 Jul 2019 02:48:47 +0000 (11:48 +0900)
commit611a78e35bc727780604d6af41570092c91e2f0c
tree58a5a00fb5e1504ec21e08e58cfdfb00350ede03
parentb7c7f1e1d836e101c24852fdce8ad8efa0fc1180
parentbbb09d23ffbf27d182dc615369fed5fa7a8cad38
Merge branch 'master' into single-inheritance