Merge branch 'master' into gh-pages

This commit is contained in:
JC Brand 2013-08-07 15:27:20 +02:00
commit 6a699dfcf2
2 changed files with 3 additions and 5 deletions

View File

@ -1,4 +1,6 @@
language: node_js
node_js:
- "0.10.13"
- "0.10"
before_script:
- "./node_modules/.bin/bower update"
script: grunt test

View File

@ -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
-------------