Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 13:06:28 +0000 (22:06 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 13:06:28 +0000 (22:06 +0900)
commitc7d13884eed801e9935bfa8b35198cf85d2bc333
treee823fac1c2b11137d8df1c50cbd0412f1cdfdcf8
parente4a1a16de7a7401e123a23ca23aec74e5834a17b
parent5fe03bc49ed4dd611fe7517a1085605be5e99834
Merge branch 'master' into single-inheritance