Merge branch 'master' into server

8b73477c · nanahira · f90b1fb7 · f928523a · 8b73477c · e8bf5b73
Commit 8b73477c authored Aug 02, 2018 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 @ e8bf5b73
+++ b/ocgcore @ e8bf5b73
-Subproject commit 18d7c0ab0c17afc0967993c1eabdbc9dcb3688db
+Subproject commit e8bf5b739cbf8d7fda15a856675c9dc2f0444181
--- a/script @ 53779312
+++ b/script @ 53779312
-Subproject commit a5facedc2c207e9cfaeacef6cb30a37c96d097f3
+Subproject commit 53779312d5d7743acec5a1becf8531c5f1ed7d58