Simon L'nu 25547cb21f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix small js error when user not logged in
  install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect

* master:
2012-05-24 19:30:41 -04:00
2012-04-10 23:45:47 -04:00
2012-05-23 07:38:31 -04:00
2012-05-15 17:18:46 -07:00
2012-05-23 15:46:04 -07:00
2012-03-02 17:18:11 +01:00
2012-05-23 15:46:04 -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%