Merge branch 'master' into test-latest-node

Conflicts: .travis.yml
revington · Jan 25, 2016 · d9b6d50 · d9b6d50
2 parents 65b004b + c315130
commit d9b6d50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,5 +3,6 @@ node_js:
   - 0.6
   - 0.8
   - 0.10
+  - 0.12
   - 4.2
   - "node"
diff --git a/README.md b/README.md
@@ -19,3 +19,7 @@ See [examples](https://github.com/revington/connect-bruteforce/tree/master/examp
 ## License
 
 See [LICENSE](https://github.com/revington/connect-bruteforce/blob/master/LICENSE)
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/revington/connect-bruteforce/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+