Go to file
Simon L'nu afe7f09b27 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  correct some filer dialog weirdness caused by introduction of categories
  move alert box away from nav links
  log disabled requests
  fix config storage of booleans

* master:
2012-04-04 23:32:16 -04:00
doc
images
include log disabled requests 2012-04-04 18:49:39 -07:00
js
library
mod correct some filer dialog weirdness caused by introduction of categories 2012-04-04 23:08:16 -04:00
spec
tests
util string update 2012-04-04 15:51:56 -07:00
view move alert box away from nav links 2012-04-04 19:13:41 -07:00
.gitignore
.gitmodules
.htaccess
INSTALL.txt
LICENSE
README
boot.php bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -07:00
build.xml
database.sql
docblox.dist.xml
htconfig.php
index.php
testargs.php
update.php

README

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.