Merge branch 'master' into another

f7f8c1ec · nanahira · 3f124de9 · 41bb47e2 · f7f8c1ec · 54cedc9b
Commit f7f8c1ec authored Apr 14, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 54cedc9b
+++ b/ocgcore @ 54cedc9b
-Subproject commit c8902079735e21f3300e80e6d7ea2afdc71d447d
+Subproject commit 54cedc9b68d500ab3167044ed5c5e526357b1c6a