This repository has been archived on 2022-04-17. You can view files and clone it, but cannot push or open issues or pull requests.

DmitriyMX 42000692fc Merge branch 'dev-webconsole' into dev-zond ...

# Conflicts:
#	bridge/build.gradle
#	bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java
#	bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java

2017-06-14 21:34:15 +03:00

..

src/main

Merge branch 'dev-webconsole' into dev-zond

2017-06-14 21:34:15 +03:00

build.gradle

Merge branch 'dev-webconsole' into dev-zond

2017-06-14 21:34:15 +03:00