Merge branch 'master' into server

bbf6fcf8 · nanahira · 7f9c3514 · e1cb4e60 · bbf6fcf8 · 504b7917
Commit bbf6fcf8 authored Nov 20, 2019 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 @ 504b7917
+++ b/script @ 504b7917
-Subproject commit 4f68468cf3b424286e3b7a8afee466347b2747c9
+Subproject commit 504b791745b2dd6aedfd9f13bc4d2f60da443557