Go to file
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
doc added much more curly braces + space between "if" and brace 2016-12-20 11:59:13 +01:00
images
include Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
js
library Merge remote-tracking branch 'upstream/develop' into develop 2016-12-13 09:59:43 +01:00
mod Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
mods
object Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
spec
tests
util No more needed ... util/typo.php is there. 2016-12-19 14:23:09 +01:00
view Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
.gitattributes Required for github/Windows 2012-06-14 18:39:48 +10:00
.gitignore
.gitmodules
.htaccess
CHANGELOG
INSTALL.txt
LICENSE
README.md
README.translate.md
Vagrantfile
boot.php added more curly braces + space between "if" and brace 2016-12-20 17:58:34 +01:00
build.xml
database.sql
docblox.dist.xml
friendica_test_data.sql
htconfig.php make vier also the default from the emergency htconfig file 2016-12-10 07:04:39 +01:00
index.php added more curly braces + space between "if" and brace 2016-12-20 17:58:34 +01:00
testargs.php
update.php Continued with coding convention: 2016-12-20 21:17:19 +01:00

README.md

Friendica Social Communications Server

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.