Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 17 Mar 2018 16:25:59 +0000 (01:25 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 17 Mar 2018 16:25:59 +0000 (01:25 +0900)
commita32d9062ee0e20afa4bddab15bad3d006d724992
treeca0fbecf619e944da422865bfcf4d2a069186a93
parente0c4908dbf5aa43fee67b38ca708ea771e97f426
parent729514a7b0648a355e9ecbe45f2bf7815493ec49
Merge branch 'master' into single-inheritance