Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 16 Mar 2019 04:40:33 +0000 (13:40 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 16 Mar 2019 04:40:33 +0000 (13:40 +0900)
commite45901204b2c5ed6086e62aa88221b6e4ad6d00a
treecdd284e14751c1cf31a87d693061f11e60308ec9
parent25a03c16f5ff03c907cb45372c8ff797ce0851a3
parentb5927250efe45f91a863b9a8c2416270992314ba
Merge branch 'master' into single-inheritance