Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 30 Apr 2020 13:38:03 +0000 (22:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 30 Apr 2020 13:38:03 +0000 (22:38 +0900)
commit59cb5c4ea48ae11d87fdb8bddc6ede8857a09031
tree3dacedec554b333a401c462051f1dfe5da7412f9
parent0cf77b400d079bc443db67df26a50fede1c832a3
parent0650116db263271be82fbe37e998f2ae9b44efbd
Merge branch 'master' into single-inheritance