Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Aug 2018 12:34:47 +0000 (21:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Aug 2018 12:34:47 +0000 (21:34 +0900)
commit30e6e661169bbc2d73cab3fb5fdd390501e257fd
tree0063576b89418d7f94d76026d1387d9240bc1c2c
parent3245ec5c20fcb3394e02e67bd44f3ec2ad7e8e5f
parente66c951a306d25a51e5339df42cd7ee04deb47d8
Merge branch 'master' into single-inheritance