merge #975 into dev

2014-10-04 09:00:45 +02:00
parent f28b380fac 9ae36e9d0f
commit a34fa75995
2 changed files with 5 additions and 4 deletions
--- a/package.json
+++ b/package.json
@@ -32,10 +32,11 @@
    "grunt-contrib-cssmin": "~0.4.1",
    "grunt-contrib-uglify": "~0.2.4",
    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-sass": "~0.5.0",
+    "grunt-sass": "~0.14.0",
    "grunt-contrib-connect": "~0.5.0",
    "grunt-zip": "~0.7.0",
-    "grunt": "~0.4.0"
+    "grunt": "~0.4.0",
+    "node-sass": "~0.9.3"
  },
  "licenses": [
    {