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)

Trivial merge