Merge remote-tracking branch 'origin/master' into placeholders

This commit is contained in:
Zef Hemel 2011-11-16 17:00:24 +01:00
commit 8978ca7bb3
2 changed files with 7 additions and 0 deletions

1
.travis.yml Normal file
View file

@ -0,0 +1 @@
language: node_js

View file

@ -166,6 +166,12 @@ You can also run the tests in your browser by serving:
This makes debugging failing tests way more easier.
Continuous Integration status
-----------------------------
This project is tested with [Travis CI](http://travis-ci.org)
[![Build Status](https://secure.travis-ci.org/ajaxorg/ace.png)](http://travis-ci.org/ajaxorg/ace)
Contributing
------------