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)
commit895cbaf3739fc990ae2a4f98b3510092318ed15b
treec4c53245213931e87ff5aab5d753332587d949b3
parentbfcaaa76237434b0ad492fae3c9e657b76c10fae
parentb43bc278db99aebd07a87d83894dce2cf0b1d6bc
Merge branch 'master' into single-inheritance