Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 12 Jul 2020 04:15:41 +0000 (13:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 12 Jul 2020 04:15:41 +0000 (13:15 +0900)
commit85cb8b70f1d1904fd3d93faf5881398562d27e4b
tree3e8d84a8793362e94ac99d09ec21925d88bd1c1a
parentdafc36bca2ca384f591cb7fd900c58d8a9146986
parent0971c377ed2009ecbcbec6060908b0c45cc580ff
Merge branch 'master' into single-inheritance