Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 26 May 2020 06:11:30 +0000 (15:11 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 26 May 2020 06:11:30 +0000 (15:11 +0900)
commit2eeb17bbc1a2b8e95361a474c31126b025bc8309
tree30a185177199201323e57e29dad7c5c3526e0611
parent6cd4f049d1f27845a6bfd8d754a37a0d1c158a3a
parentcbdbed3fa3a3d594c90ba6d56663fb8d0cd54bf9
Merge branch 'master' into single-inheritance