Merge branch 'card-dev' into gemp-dev

# Conflicts: # gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js # gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
2021-03-22 20:14:19 -05:00
parent 90715d4f8b f958f11dec
commit d6548ebbbb
42 changed files with 3915 additions and 97 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ logs/*
 .idea/
 *.iml
 remote-sync
-replay
+replay
+!replay/.placeholder