Merge branch 'master' into server

3d9340a0 · nanahira · 1860d4bf · a9fc0e66 · 3d9340a0 · 60c70bea
Commit 3d9340a0 authored Sep 08, 2022 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 60c70bea
+++ b/ocgcore @ 60c70bea
-Subproject commit d2cbf8a74dc3e3443a74d34e495cc9acc31fc801
+Subproject commit 60c70bea70ffe6cfb2e5da725760c716b2c20ded
--- a/script @ f13fb519
+++ b/script @ f13fb519
-Subproject commit a0c5dba6afc89817e76d28db8a0562b6708f1412
+Subproject commit f13fb5190cf10bfecec0d37d2bf769a84d042fb1