Simon L'nu 8d4c77fc43 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  database updates
  Debugged implementation of Diaspora relayable_retractions
  cleanup and logging
  first shot at getting like/unlike functions to work consistently
  Fix bugs in the retraction code
  prepare to implement database update
  Implement relaying of relayable_retractions
  Support relayable_retractions that are relayed to us by the top-level post owner
  quattro: admin panel styling and 1st buttons for addon/theme overview
  privacy settings: make submit button translateable
  DE: update to the strings
  prv messages: make submit translateable

* master:
2012-06-03 18:03:20 -04:00
2012-04-10 23:45:47 -04:00
2012-05-23 07:38:31 -04:00
2012-05-30 15:56:11 -07:00
2012-05-15 17:18:46 -07:00
2012-06-03 14:47:53 -07:00
2012-06-03 14:53:30 -06:00
2012-03-02 17:18:11 +01:00
2012-03-09 12:16:58 +01:00
2012-06-03 14:53:30 -06:00
2012-03-08 16:25:14 +11:00
2012-06-03 14:53:30 -06: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%