Skip to content

Commit

Permalink
Merge branch '3.2.0-dev' into 3.3.0-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
88250 committed Aug 6, 2018
2 parents dc2b64e + f066a58 commit 84e4f19
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
27 changes: 17 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"gulp-clean": "^0.4.0",
"gulp-clean-css": "^3.9.4",
"gulp-concat": "^2.6.1",
"gulp-rename": "^1.2.3",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.1",
"gulp-uglify": "^3.0.0",
"gulp-uglify": "^3.0.1",
"marked": "^0.3.19"
},
"dependencies": {
Expand Down

0 comments on commit 84e4f19

Please sign in to comment.