Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 2 Oct 2020 10:04:45 +0000 (19:04 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 2 Oct 2020 10:04:45 +0000 (19:04 +0900)
commit8d20ae0eafe423454839a82dbc9524badf146a2c
tree6bd19caf9df35c8f7b027420201189b560d833ea
parent62a7acebc3d20cf3965b5258e4f1b503fdb1e3fa
parenta20908c4a5f3534a8237c6357881de0dcca2570c
Merge branch 'master' into single-inheritance