Go to file
Simon L'nu 94d4cad701 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master:
2012-03-06 18:15:45 -05:00
doc
images add img 2012-03-06 08:31:54 +01:00
include bugs #312, #313 2012-03-06 14:27:53 -08:00
js fix @mention autocomplete in comments 2012-03-03 00:12:45 +01:00
library finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
mod [PRIVACY] privacy issue bug #314 2012-03-06 14:53:14 -08:00
util string update 2012-03-06 15:09:57 -08:00
view dispy, dispy, oh what a little lispy 2012-03-06 17:55:05 -05:00
.gitignore
.gitmodules
.htaccess
INSTALL.txt
LICENSE
README
boot.php revup 2012-03-06 13:57:38 -08:00
build.xml
database.sql
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php add diabook to default themes 2012-03-02 16:24:26 -08:00
index.php
testargs.php
update.php
zot.txt

README

Friendica Social Communications Server
======================================

Welcome to the free social web.