Merge branch 'master' of github.com:Qard/crsh

Qard · Jan 5, 2013 · 5bc7915 · 5bc7915
2 parents 30b86ff + 3729b6e
commit 5bc7915
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.6
+  - 0.8
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+[![build status](https://secure.travis-ci.org/Qard/crsh.png)](http://travis-ci.org/Qard/crsh)
 # CRSH your javascript and css into tiny blocks.
 With crsh, you can combine a whole bunch of javascript and coffeescript or css and stylus files into one tiny block. Or several if you like. All files are compiled and merged automagically after each change, but the watcher is disabled in production. In production, resulting javascript will also be uglified.