mirror of
https://github.com/SimplexDevelopment/FreedomNetworkSuite.git
synced 2025-01-11 19:07:40 +00:00
df442ef4b0
# Conflicts: # Patchwork/src/main/java/fns/patchwork/config/Configuration.java # Veritas/src/main/java/fns/veritas/Aggregate.java # Veritas/src/main/java/fns/veritas/bukkit/ServerListener.java # Veritas/src/main/java/fns/veritas/client/BotClient.java # Veritas/src/main/java/fns/veritas/client/BotConfig.java