Merge branch 'develop' with last source (Zicog) integration + Monitor…

…Event
witsa · Dec 18, 2018 · 7135c77 · 7135c77
2 parents 194693c + 83a96fc
commit 7135c77
Show file tree

Hide file tree

Showing 10 changed files with 4,684 additions and 291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ bin/*
 examples/embeddedApp/embeddedApp
 backup
 lib
-*.lps
+*.lps
+node_modules
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,5 @@ bin/* @@
     examples/embeddedApp/embeddedApp
     backup
     lib
-    *.lps
+    *.lps
+    node_modules