Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Apr 2019 17:10:03 +0000 (02:10 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Apr 2019 17:10:03 +0000 (02:10 +0900)
commit1f0bd91f62b208da986306588063809e833f20fb
tree87dc3b742eea75582da342c51abd75025aca7e2a
parent86599b554f66e0644c5e75d9ba0669baaa7e21d3
parente2de77d4d30c7ed9f8ae6d891874417004207624
Merge branch 'master' into single-inheritance