Simon L'nu 39a7926015 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  send browser back to correct page (with query args) after posting
  slight improvement in a couple of queries
  Diabook-dark - do things the right way instead of the stupid way.
  Fix TinyMCE, but needs adding to theme.php
  Fix jquery.fancybox, but still needs adding to theme.php
  Diabook-dark cleaned up a bit.
  don't provide 'show more' on remote friends in common unless there are actually more
  make it optional to optimize the item table after expire
  wrap private message autocomplete in an ifdef to make it easier to test/develop
  DE update for the strings
  make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation

* master:
2012-05-09 14:00:54 -04:00
2012-04-10 23:45:47 -04:00
2012-05-06 19:55:39 -07:00
2012-03-02 17:18:11 +01:00
2012-03-09 12:16:58 +01:00
2012-03-08 16:25:14 +11: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.  
Description
This is a clone of the Friendica repository.
https://github.com/friendica/friendica
Readme 183 MiB
Languages
PHP 85.4%
Smarty 6.4%
CSS 4.8%
JavaScript 2.7%
Less 0.4%
Other 0.2%