Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 02:20:28 +0000 (11:20 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 02:20:28 +0000 (11:20 +0900)
commite6bf824e35e248b14efc550931c4ea5fbf7b5cef
treed4fc6746c1bfcc82b5239dc0a528a12db832ea67
parent58f4fe0a175a5c9eae3192760a93a33d989f88a8
parentf2a02bd65759e0c2ffabad6506e2c7e900bb21fc
Merge branch 'master' into single-inheritance