Merge branch 'dev-webconsole' into dev-zond-recode

# Conflicts: # build.gradle
2017-06-15 22:54:21 +03:00
parent 1c7e4d3545 6ffb63ceb2
commit 846e37c31d
17 changed files with 6 additions and 7 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,6 @@ rootProject.name = 'asys'
 include 'core'
 include 'webinterface'
 include 'mcserver-manager'
-include 'bridge-protocol'
+include 'libprotocol'
 include 'bridge'
 include 'zond'