Merge branch 'master' into server

ecab679e · nanahira · 5b4f1435 · b0233151 · ecab679e · 1b8b3c99
Commit ecab679e authored Aug 20, 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 @ 1b8b3c99
+++ b/ocgcore @ 1b8b3c99
-Subproject commit 18e35de0880985b34aeeac3082505478900d774c
+Subproject commit 1b8b3c99eff96d05ef3d5be6daadbb2dfd5a8d42
--- a/script @ a75989b0
+++ b/script @ a75989b0
-Subproject commit 7739569a385e8215ec7caac5377681d69fd0b911
+Subproject commit a75989b0a4fe1a98dbfb34ef8fb89aec3d1789f8