Merge branch 'master' into server

173b191c · nanahira · ab7e773f · 099c80a1 · 173b191c · 902bed70
Commit 173b191c authored Sep 14, 2019 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 @ 902bed70
+++ b/ocgcore @ 902bed70
-Subproject commit 01413f65b6902fd533fd26f8599e23b4b98438c1
+Subproject commit 902bed70ded266070fb76c01247ca0fbaad5372d
--- a/script @ d9b39882
+++ b/script @ d9b39882
-Subproject commit 36997b47d87c8d1fb564746ffa8914bd84d5e94f
+Subproject commit d9b39882e5722ac329f73597005081663b4a5f2d