friendica_2021-01/view
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
..
fonts ShaShape font updated 2016-06-01 20:03:56 +02:00
install Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
lang DE translation of the core 2016-12-19 12:22:47 +01:00
php *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 2016-12-19 14:27:16 +01:00
smarty3
templates provide local time for notifications 2016-12-22 00:28:52 +01:00
theme Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
.htaccess recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
custom_tinymce.css
global.css Add protocol whitelist for href/src attributes 2016-12-03 14:19:57 -05:00