Go to file
Simon L'nu a3d95f79f2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  well that was a silly mistake...
  setting wasn't being applied
  rev update
  diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
  diabook: theme-settings: users can set font-size and line-height for posts and comments
  diabook-themes: small fixes
  quattro: language icon in navbar
  move html out of lang_selector() and new template lang_selector.tpl
  display settings: show theme screenshot on page load
  quattro: add admin theme settigs. darker items background with a bottom border.
  admin: change global theme settings
  quattro: work on     "like" activitiy items less visible     fixes to widths     popup notification out of navbar     category input in jot
  validate_url allow naked subdomain if is "localhost"

* master:
2012-04-13 19:26:18 -04:00
doc
images
include Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
js
library
mod well that was a silly mistake... 2012-04-13 16:12:06 -07:00
spec
tests
util rev update 2012-04-13 14:44:37 -07:00
view well that was a silly mistake... 2012-04-13 16:12:06 -07:00
.gitignore
.gitmodules
.htaccess
INSTALL.txt
LICENSE
README
boot.php rev update 2012-04-13 14:44:37 -07:00
build.xml
database.sql reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
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.