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 8d38b9774c Merge remote-tracking branch 'origin/dev-webconsole' into local-merge ...

# Conflicts:
#	bridge-protocol/build.gradle
#	bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java
#	bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java
#	mcserver-manager/build.gradle
#	mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java

2017-06-08 13:27:05 +03:00

..

src/main

Merge remote-tracking branch 'origin/dev-webconsole' into local-merge

2017-06-08 13:27:05 +03:00

build.gradle

Bridge: успешная отправка логов на MCSM

2017-06-08 11:16:57 +03:00