Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 10 Nov 2017 06:18:13 +0000 (15:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 10 Nov 2017 06:18:13 +0000 (15:18 +0900)
commitad06ca8f05432bf9e6a2564c44905641225b410b
treebd1ad66e51602f3c13f50506d301db6261b1c75c
parentb7f941793671a1808680753b7eb8355934aaf1c7
parent005d535d8854c956d538f9b674797968175b1bae
Merge branch 'master' into single-inheritance