diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 10:46:40 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 10:46:40 -0500 |
| commit | bc3051e113245f518e40bb1196521c9fc4ab7bbc (patch) | |
| tree | 8f1ef296d13b82a7e27a8eba183152292c885812 /README | |
| parent | d90c830332899629a6016f1767bb7dff7d0d56a9 (diff) | |
| parent | 08b5ede5a18647655a0c89f0c40118e2259117be (diff) | |
| download | volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.gz volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.bz2 volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add links to /profiles, add some icons to diabook/icons, fixes in css
Update README
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
* master:
Diffstat (limited to 'README')
| -rw-r--r-- | README | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,4 +1,11 @@ Friendica Social Communications Server ====================================== +http://friendica.com + Welcome to the free social web. + + +Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers. + +Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.
\ No newline at end of file |