Merge branch 'master' into server

bf7383dc · nanahira · 14a81ff5 · c0dbfe4f · bf7383dc · 0ed8a3fa
Commit bf7383dc authored Jul 16, 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 @ 0ed8a3fa
+++ b/script @ 0ed8a3fa
-Subproject commit 93c9b7f76a54e7dbf65cbeeb8eb55d9828a83621
+Subproject commit 0ed8a3fadd88abb0b21870c4e4fc7c2d27988a0d