diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-02 10:35:52 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-02 10:35:52 +0100 |
| commit | 0b4a6f8eaca0d1396e7e944cd4735a573bd1d111 (patch) | |
| tree | d2f8907a7e23fed86dba1e7e49ef11547b904fdf /README | |
| parent | e024360d44c666072b0b5e7a035cef1e00a043ee (diff) | |
| parent | be3cfe8b65031103b195854e0770ed6b3f57d9a1 (diff) | |
| download | volse-hubzilla-0b4a6f8eaca0d1396e7e944cd4735a573bd1d111.tar.gz volse-hubzilla-0b4a6f8eaca0d1396e7e944cd4735a573bd1d111.tar.bz2 volse-hubzilla-0b4a6f8eaca0d1396e7e944cd4735a573bd1d111.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'README')
| -rw-r--r-- | README | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -41,8 +41,8 @@ interaction you've grown to love, *and* was free to use, *and* was open source, And what if this social network could scale to encompass the entire internet, and *not* require a central organisation to provide servers (in -exchange for selling your private information - and everything else they can -find out about you from logging all of your online activities and +exchange for selling your private information; and everything else they can +find out about you - from logging all of your online activities and conversations)? Look no further. |