diff options
| author | Raphael <raphael@joindiaspora.com> | 2010-09-23 02:42:46 +0400 |
|---|---|---|
| committer | Raphael <raphael@joindiaspora.com> | 2010-09-23 02:42:46 +0400 |
| commit | 486b9e8bbe8720e6d78c4356226066c22362e2ee (patch) | |
| tree | 90bd7c71821d561dd802b6b32a1482c3895d5eff /README.md | |
| parent | fa1e09cadbfb5a1b505398e299e7777d40bf3ff2 (diff) | |
| parent | b03c90f6f2fad68dbb1bea2ac14b0598f7232fd3 (diff) | |
Merge branch 'master' into HEAD
Conflicts:
README.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -325,10 +325,10 @@ Ongoing discussion: - [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev) ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev)) -More general info and updates about the project can be found on our -[blog](http://joindiaspora.com), -[and on Twitter](http://twitter.com/joindiaspora). Also, be sure to join the -official [mailing list](http://http://eepurl.com/Vebk). +More general info and updates about the project can be found on: +[Our blog](http://joindiaspora.com), +[and on Twitter](http://twitter.com/joindiaspora). +Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk). If you wish to contact us privately about any exploits in Diaspora you may find, you can email |