Merge branch 'master' into gh-pages

6a699dfc · JC Brand · 944593de · 56823112 · 6a699dfc · 6a699dfc
Commit 6a699dfc authored Aug 07, 2013 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

.travis.yml .travis.yml +3 -1

README.rst README.rst +0 -4

No files found.
--- a/.travis.yml
+++ b/.travis.yml
 language: node_js
 node_js:
- - "0.10.13"
+ - "0.10"
+before_script:
+ - "./node_modules/.bin/bower update"
 script: grunt test
--- a/README.rst
+++ b/README.rst
@@ -50,10 +50,6 @@ Tests
 We use behavior-driven tests written with jasmine.js_. They can run in your
 browser or in the command line via phantom.js_.

-We use `Travis-CI`_ for continuous integration.
-
-.. image:: https://api.travis-ci.org/jcbrand/converse.js.png?branch=master
-
 -------------
 Documentation
 -------------