Gilles-Philippe Morin 2015-01-12 18:01:43 -05:00
parent e5d725a604
commit 85129fba2c

View file

@ -1,5 +1,5 @@
# diaspora*
### a privacy aware, distributed, open source social network
### a privacy-aware, distributed, open source social network
**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) |