1
1
Fork 0
friendica_2019-12_sharedHos.../view
Roland Häder ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
2016-12-19 09:40:34 +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, ES update to the translation 2016-12-09 12:36:28 +01:00
php add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
smarty3 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
templates OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
theme Cleanup for #3010 - added spaces, thanks to @annando . 2016-12-14 09:42:28 +01:00
.htaccess recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
custom_tinymce.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
global.css Add protocol whitelist for href/src attributes 2016-12-03 14:19:57 -05:00