Merge branch 'master' into server

c345853f · nanahira · f9809866 · 7af7ae23 · c345853f · c345853f
Commit c345853f authored Dec 15, 2020 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 393 additions and 9 deletions

cards.cdb cards.cdb +0 -0

lflist.conf lflist.conf +392 -8

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/lflist.conf
+++ b/lflist.conf
--- a/script @ 114acd4a
+++ b/script @ 114acd4a
-Subproject commit d2b54db1e85825ce3344a777ae0b35e4c728eb79
+Subproject commit 114acd4a251b0c1d37e8d9e61ee042c87609f7cd