Merge branch 'master' into server

2407997f · nanahira · 6c4feb1c · 8d12a5c6 · 2407997f · 05f636fd
Commit 2407997f authored Nov 22, 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 @ 05f636fd
+++ b/ocgcore @ 05f636fd
-Subproject commit e2b98d5c5e7ea7a08eb4c19053a4de014fe41342
+Subproject commit 05f636fd6248114ae8676d9f453c11e14f157eaf