Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 28 Nov 2018 10:48:54 +0000 (19:48 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 28 Nov 2018 10:48:54 +0000 (19:48 +0900)
commit852c76b51ccf61857ba182e4665c3f525f58d293
treea65201e10ae52d6f359151e27d5e8d9bbb1acfa1
parentf4bf893530729c70c8c1220b5798992c7485d29f
parent7581ff13559e347a4882d627c12d3b5f23143b7a
Merge branch 'master' into single-inheritance