Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 8 Jan 2020 13:35:42 +0000 (22:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 8 Jan 2020 13:35:42 +0000 (22:35 +0900)
commit18cbd78836f9eb0a1d496c5d8f6529b5bc5ac576
treeea6dcb0fc835e86176f670f8954bc1b3317316e9
parentaded7bc682f10d4eb4803a305933436754e9a1fa
parent148d492c62b02aeca50b9aeec4d4e07ec3b94fbc
Merge branch 'master' into single-inheritance