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/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ subprojects {
 }

 subprojects {
-    if (!it.name.startsWith('bridge') && !it.name.startsWith('zond')) {
+    if (it.name != 'bridge' && it.name != 'zond' && !it.name.startsWith('lib')) {
        ext {
            slf4jVersion = '1.7.21'
        }