Permalink
Browse files

let travis build develop and update readme to display the status

  • Loading branch information...
1 parent 6c1a1ec commit ded404f5713cf436645ed25bb3ce47b87ec373e2 @jhass jhass committed Sep 16, 2012
Showing with 6 additions and 8 deletions.
  1. +1 −0 .travis.yml
  2. +5 −8 README.md
View
@@ -1,6 +1,7 @@
branches:
only:
- 'master'
+ - 'develop'
language: ruby
rvm:
View
@@ -2,14 +2,11 @@ Diaspora*
Diaspora is a privacy-aware, personally-controlled, do-it-all open source social network. Check out our [project site](http://diasporaproject.org).
-[![Build Status](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
-[![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/diaspora/diaspora)
-
-************************
-Diaspora is currently going through a huge refactoring push, the code is changing fast!
-If you want to do something big, reach out on IRC or the mailing list first, so you can contribute effectively <3333
-************************
+* **master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
+* **develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora)
+* [![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
+* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/diaspora/diaspora)
+
With Diaspora you can:

0 comments on commit ded404f

Please sign in to comment.