Mirror of the github repository of Friendica
Find a file
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	include/items.php
	update.php
2013-01-20 14:07:57 +01:00
doc
images
include Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
js
library
mod Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
mods
object Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
spec
tests
util
view Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
.gitattributes
.gitignore
.gitmodules
.htaccess
boot.php Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
build.xml
convert_innodb.sql
database.sql Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00
docblox.dist.xml
htconfig.php
index.php
INSTALL.txt
LICENSE
README
testargs.php
update.php Merge remote-tracking branch 'upstream/master' 2013-01-20 14:07:57 +01:00

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.

Report issues at http://bugs.friendica.com/