Merge branch 'master' into server

cfcaa5f2 · nanahira · caa08529 · a8936b68 · cfcaa5f2 · cf3a323b
Commit cfcaa5f2 authored Jan 01, 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 @ cf3a323b
+++ b/ocgcore @ cf3a323b
-Subproject commit 1869873106359b64e06a263b31e2e2ad529e9933
+Subproject commit cf3a323bec3209c1a004808563b397a753a16c70
--- a/script @ 596d1081
+++ b/script @ 596d1081
-Subproject commit a57b3522f6acb3d1e37a484654ef7cecf2b7f774
+Subproject commit 596d1081d4ca129c615a40b92a21ca485d4e4809