Merge branch 'master' into another

c0d9c667 · nanahira · 871c7a9f · 100f6890 · c0d9c667 · 6118ae22
Commit c0d9c667 authored Aug 22, 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 @ 6118ae22
+++ b/ocgcore @ 6118ae22
-Subproject commit 1b92dc064e774fb9a81024d246ce4844df37301f
+Subproject commit 6118ae227258286133cd6664983778da8b34ae09
--- a/script @ 19e429d7
+++ b/script @ 19e429d7
-Subproject commit ef7429d8fc703a393b8f87c6213e0987801ef060
+Subproject commit 19e429d77112b5cb59c638176811e221753f53cc