Merge branch '1.2' into 1.3

* 1.2:
  Yarn conflicts resolved
  Update gulp-livereload
This commit is contained in:
Mateusz Zalewski 2018-11-28 10:16:35 +01:00
commit 8ba3ee11bc
No known key found for this signature in database
GPG key ID: 0545A7503DD474B8
2 changed files with 1207 additions and 1059 deletions

View file

@ -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",

2264
yarn.lock

File diff suppressed because it is too large Load diff