Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo@chise.kanji.zinbun.kyoto-u.ac.jp>
Wed, 15 Apr 2020 14:07:06 +0000 (23:07 +0900)
committerMORIOKA Tomohiko <tomo@chise.kanji.zinbun.kyoto-u.ac.jp>
Wed, 15 Apr 2020 14:07:06 +0000 (23:07 +0900)

Trivial merge