Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 15 Mar 2019 18:28:53 +0000 (03:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 15 Mar 2019 18:28:53 +0000 (03:28 +0900)
commit25a03c16f5ff03c907cb45372c8ff797ce0851a3
treeb76c64dfe28120aa1c4721220569c75e959e30dc
parentcda4ca7e5cc171693cf7f66b4a694e99f777821f
parent091ce84c9a7b03d192db3a5a667c210145803b65
Merge branch 'master' into single-inheritance