Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 18 Mar 2020 15:30:29 +0000 (00:30 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 18 Mar 2020 15:30:29 +0000 (00:30 +0900)
commit6b933a4e5a9cbef438dc53b3017e048fb5827373
treebaf31a68c604bdfa573bee99bd38c631c186950e
parent6243c68688cf329af176c66b3552ae77cc5517e3
parent041d43964bdd20dcb9be565e3241d3c61a60ed7e
Merge branch 'master' into single-inheritance