Go to file
Michael Vogel 1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
Conflicts:
	mod/contacts.php
2015-04-12 09:59:28 +02:00
doc
images
include Merge pull request #1505 from annando/1504-unified-follow 2015-04-12 08:48:36 +02:00
js
library
mod Merge remote-tracking branch 'upstream/develop' into 1504-contact-update 2015-04-12 09:59:28 +02:00
mods
object
spec
tests
util
view Merge remote-tracking branch 'upstream/develop' into 1504-contact-update 2015-04-12 09:59:28 +02:00
.gitattributes
.gitignore
.gitmodules
.htaccess
CHANGELOG
INSTALL.txt
LICENSE
README.md
README.translate.md
Vagrantfile
boot.php
build.xml
convert_innodb.sql
database.sql
docblox.dist.xml
friendica_test_data.sql
htconfig.php
index.php
testargs.php
update.php

README.md

Friendica Social Communications Server

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.