Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo@chise.kanji.zinbun.kyoto-u.ac.jp>
Tue, 7 Apr 2020 14:29:26 +0000 (23:29 +0900)
committerMORIOKA Tomohiko <tomo@chise.kanji.zinbun.kyoto-u.ac.jp>
Tue, 7 Apr 2020 14:29:26 +0000 (23:29 +0900)
commitf1258fecf42cc2755035159a578b4ef0f74b46c0
tree057cea1e305c51ebc6d5e1318eedfb482e167630
parent5729b2d0dc3e39d816d19330aa478841d3a389b4
parentdbcf82c157e1be6b13c1c46e5d5d0eaba6f29328
Merge branch 'master' into single-inheritance