Merge branch 'siv/develop' into feature_s/#1115_Modern_Watch_List

SCADA-LTS · Feb 18, 2020 · d95a95e · d95a95e
2 parents f908e33 + 5c394b6
commit d95a95e
Show file tree

Hide file tree

Showing 17 changed files with 26,724 additions and 26,915 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,7 @@ branches:
   - "/^feature_s/#1094_.*$/"
   - "/^feature_s/#1107_.*$/"
   - "/^feature_s/#1115.*$/"
+  - "/^feature/#1130.*$/"
   - "/^feature_s/#1128_.*$/"
 notifications:
   email: false