Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Jun 2019 06:38:49 +0000 (15:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Jun 2019 06:38:49 +0000 (15:38 +0900)
commit3accf018915effe130ae9754a5d9a8e64597b44f
tree1d211093ff29517e6d28e9b044021bebc21fca97
parent1bf1c5bf4a6dc9ae6d8973709c8c3cd951f0955f
parentc64f285c4f8cda322b1f65bc10c15c9d5a47d64e
Merge branch 'master' into single-inheritance