Merge branch 'master' into feature/112-deprecated-modules

stefanjudis · Sep 3, 2014 · 82421de · 82421de
2 parents ae58c24 + f0204ce
commit 82421de
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.jshintrc b/.jshintrc
@@ -14,5 +14,6 @@
   "unused": true,
   "trailing": true,
   "maxparams": 3,
-  "maxdepth": 3
+  "maxdepth": 3,
+  "predef": [ "-Promise" ]
 }