diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-05-30 06:19:59 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-05-30 06:19:59 +0200 |
| commit | 087f79236e79975d482f739e84cc16f6648e1bec (patch) | |
| tree | e7296753df9d9ae92adbc5acf9d2997193b65d99 /README | |
| parent | 770d1bb7a368cdaba8e7340b54fd4b13ffea66b8 (diff) | |
| parent | c3478a1485334e9a399fe0786af54d63bb666a60 (diff) | |
| download | volse-hubzilla-087f79236e79975d482f739e84cc16f6648e1bec.tar.gz volse-hubzilla-087f79236e79975d482f739e84cc16f6648e1bec.tar.bz2 volse-hubzilla-087f79236e79975d482f739e84cc16f6648e1bec.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'README')
| -rw-r--r-- | README | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -27,12 +27,12 @@ private social circles, and which cannot be seen outside the circle. Friendika is decentralised. Any account on any Friendika server can connect with any account on any other Friendika server. You can also connect to and -interact directly with friends on Status.Net and other federated social web -services (e.g. identi.ca, GNU-Social, etc.). +interact directly with friends on Facebook, Status.Net, and other federated +social web services (e.g. identi.ca, GNU-Social, etc.). - Outgoing communications can be directed at these networks and also -existing accounts on Facebook and Twitter - or even delivered to email -contacts. + Outgoing communications can be directed to Friendika, existing accounts on +Facebook and Twitter, federated social web providers - or even delivered to +email contacts. Incoming data streams aren't limited to traditional social networks. They may include most any service which provides a syndication feed (both RSS |