Mirror of the github repository of Friendica
Find a file
Simon L'nu bc69a957dc Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  ignore removed plugins
  fix messed up config tables w/ duplicate entries
  small fixes for the German strings
  fix bad sql update
  revert config changes, we're getting duplicate keys
  new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...

* master:
2012-04-07 03:10:09 -04:00
doc Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include ignore removed plugins 2012-04-06 05:21:42 -07:00
js new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... 2012-04-06 11:19:12 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod Merge branch 'pull' 2012-04-05 21:43:38 -07:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
util Merge branch 'pull' 2012-04-05 21:43:38 -07:00
view Merge pull request #210 from tomtom84/master 2012-04-06 04:29:01 -07:00
.gitignore Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
boot.php fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
index.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
INSTALL.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
LICENSE Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07: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.