Simon L'nu cee3608747 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: small fix
  changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
  ignore utf8 offset error for unit tests
  had arg order backwards
  try assertContains
  tag tests cont.
  fix autonamenegativelength test
  some work on tests

* master:
2012-04-07 14:47:02 -04:00
2012-04-07 02:11:56 -07:00
2012-04-07 02:23:11 -07:00
2012-04-07 01:04:45 -07:00
2012-04-07 19:56:00 +02:00
2012-03-02 17:18:11 +01:00
2012-04-07 01:04:45 -07: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%