Merge branch 'master' into server

153b3441 · nanahira · f011a623 · 5ef8e04f · 153b3441 · 11c41b10
Commit 153b3441 authored Jul 31, 2020 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 @ 11c41b10
+++ b/ocgcore @ 11c41b10
-Subproject commit eb7e9e8beee0a764c69da7cdeda3e4e0298030a8
+Subproject commit 11c41b10844c918a229a5e4193ef3569b9338584
--- a/script @ 9f2fc286
+++ b/script @ 9f2fc286
-Subproject commit e845cf31fe55fc31b563906e7b9346b46f721814
+Subproject commit 9f2fc286b538bf3cd870deda821f0da90c415e09