Merge 2a4c154 into 2a2cfb9

mapbox · Jul 29, 2015 · 30518e9 · 30518e9
2 parents 2a2cfb9 + 2a4c154
commit 30518e9
Show file tree

Hide file tree

Showing 10 changed files with 1,453 additions and 3 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,7 @@
     "quotes": [2, "single"],
     "camelcase": [0],
     "no-ternary": [2],
-    "valid-jsdoc": [2]
+    "valid-jsdoc": [2],
+    "curly": [2, "multi-line"]
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.nyc_output/
+coverage/
diff --git a/.travis.yml b/.travis.yml
@@ -4,5 +4,5 @@ node_js:
 - '0.10'
 env:
   global:
-  - secure: DPPQd38yi4xZVJXi2273HshEYU3NGM6TBwGnEeGfGKW6DoC5BLNUHx+1wm8FxkridTcJ06Mb8A9pXmVm+MN9kbtytcerERV9dvp8+ATD9FJgaaX+d968/fh1vC6DO5dGZk+sQFMzn4XHYnrGN68IyaCnYRyFIgrosFYQpEdx+AY=
   - secure: Fr2V0A0131xmPzvU9IWwjfElqnguY0aGcyApbLYbcKEiB/yyNptkYpo5pCyGBeWJI6A57jOlqkj8+rAJHnnOyWQThH78J2XuQB9tvsODVMRio9ew4umUO8tGc6MJzc4Qv+Zm3IrPXFYE72O2OGGHcV622mlrNwnzqOQ9WRR+8LY=
+  - secure: Dtn89skkYcoS0f3T5Ojtlhf7Ip6Kfy2786UR1KtIJbq7WREWnd4HhfDHoLuFzKRpipqXEEnnxgAyf9NDDcB3/4tn4uoBNmkVE3uSx4px8yUQeVLroE0arsXvMODqGa5L14rPf0NGYyEewAMiksPbY6TCrh12sVb4W9Y8tYrM8AI=