friendica/view/theme
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
..
duepuntozero Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
frio Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
frost Opps, forgot this ... 2016-12-20 12:38:23 +01:00
frost-mobile Opps, forgot this ... 2016-12-20 12:38:23 +01:00
quattro Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
smoothly changed to this: 2016-12-20 10:59:06 +01:00
vier Continued with coding convention: 2016-12-20 21:17:19 +01:00