Merge branch 'master' into server

7acfd498 · nanahira · c2581522 · b1996e84 · 7acfd498 · ba72536e
Commit 7acfd498 authored Feb 24, 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 @ ba72536e
+++ b/ocgcore @ ba72536e
-Subproject commit 119606e1f8ba8cd9f7975c7ea384ebe190254fbb
+Subproject commit ba72536e154a4acf5af41a70227f8b1ff3da422e
--- a/script @ 12feaa26
+++ b/script @ 12feaa26
-Subproject commit 3a78c31f24b22ca96bf5952fea20292312dfdafc
+Subproject commit 12feaa2622e33802667083a90b4a93356a739a5d