Merge branch '1.2' into 1.3

* 1.2: Yarn conflicts resolved Update gulp-livereload
Shasthojoy · Nov 28, 2018 · 8ba3ee1 · 8ba3ee1
2 parents 4166cf8 + 22c1f09
commit 8ba3ee1
Show file tree

Hide file tree

Showing 2 changed files with 1,206 additions and 1,058 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "gulp-concat": "^2.6.0",
     "gulp-debug": "^2.1.2",
     "gulp-if": "^2.0.0",
-    "gulp-livereload": "^3.8.1",
+    "gulp-livereload": "^4.0.1",
     "gulp-order": "^1.1.1",
     "gulp-sass": "^4.0.1",
     "gulp-sourcemaps": "^1.6.0",