Merge branch 'master' into server

247e50a8 · nanahira · d34192cc · 9c7c5ba0 · 247e50a8 · 21766e4b
Commit 247e50a8 authored Sep 07, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cards.cdb cards.cdb +0 -0

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/script @ 21766e4b
+++ b/script @ 21766e4b
-Subproject commit 0d848b379e0d010fbe1a86b641485c15173f9944
+Subproject commit 21766e4ba24a3a915c6d63053c30b25805a78629