Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 4 May 2019 06:57:37 +0000 (15:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 4 May 2019 06:57:37 +0000 (15:57 +0900)
commitf66f09e3943abeeb1e8de2075f65409c51c350e2
tree80d152d74ba4002ce331d7866a597d30486916d5
parent4ceaf3506b8dbb55de7557530ab52e2af31c306f
parent93a4a456f3e86a543559e2a4a2926fc4d6009a8e
Merge branch 'master' into single-inheritance