Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 19 Feb 2019 10:42:21 +0000 (19:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 19 Feb 2019 10:42:21 +0000 (19:42 +0900)
commitd1c6ec70130117976fded5dc05bb7497933bce99
treeb97b59041d3fda051e661ee780b6098a15010145
parent6a2f42e56e42bb3a67b46440f5933de2ea251d7c
parent400318c85135df9fe3c17b931a2fe99ca5bcd38b
Merge branch 'master' into single-inheritance