Mirror of the github repository of Friendica
Find a file
Michael Vogel 572678fef9 Merge commit 'upstream/master'
Conflicts:

	include/dba.php
2012-04-13 00:10:41 +02:00
doc
images
include Merge commit 'upstream/master' 2012-04-13 00:10:41 +02:00
js
library
mod Merge commit 'upstream/master' 2012-04-13 00:10:41 +02:00
spec
tests
util
view Merge commit 'upstream/master' 2012-04-13 00:10:41 +02:00
.gitignore
.gitmodules
.htaccess
boot.php
build.xml
database.sql
docblox.dist.xml
htconfig.php
index.php
INSTALL.txt
LICENSE
README
testargs.php
update.php

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.