Christian 'ketura' McCarty eb54ab7f95 Merge branch 'grand-card-rework' into v2-cards ...

# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js

2024-10-30 21:34:12 -05:00

..

src/main

Merge branch 'grand-card-rework' into v2-cards

2024-10-30 21:34:12 -05:00

pom.xml

Upgrading Java from 17 -> 21 and upgrading all dependencies

2024-04-16 23:58:49 -05:00

zip-web-descriptor.xml

Upgrading Java from 17 -> 21 and upgrading all dependencies

2024-04-16 23:58:49 -05:00