Merge branch 'master' into server

ba5a8c08 · nanahira · f30ad84e · 0342a1a1 · ba5a8c08 · ff4d3754
Commit ba5a8c08 authored Oct 18, 2020 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 @ ff4d3754
+++ b/ocgcore @ ff4d3754
-Subproject commit c74b1cf03f536b951ba8cdedf4a5e0f8ab4f37d2
+Subproject commit ff4d3754213c1788bd471b53cef3a70398d81761
--- a/script @ b06ee643
+++ b/script @ b06ee643
-Subproject commit b6819fc3480b886fd6f1a840297e8df2367e0c43
+Subproject commit b06ee64314aaf7d305837d41ccdce68fdef753b4