Merge branch 'refs/heads/master' into develop

Bttstrp · May 26, 2014 · 5adfc1f · 5adfc1f
2 parents 0ec5fd6 + 263e83c
commit 5adfc1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -9,7 +9,6 @@
   "ignore": [
     "docs",
     "test",
-    "src",
     "CNAME",
     "coffeelint.json",
     "composer.json",

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "gulp-coffee": "~1.4.3",
     "gulp-util": "~2.2.14",
     "gulp-header": "~1.0.2",
-    "gulp-uglify": "~0.2.1",
+    "gulp-uglify": "~0.3.0",
     "gulp-coffeelint": "~0.3.3",
     "gulp": "~3.6.1",
     "gulp-less": "~1.2.3",