Roland Häder ace8f753ac added much more curly braces + space between "if" and brace ... Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/bookmarklet.php mod/community.php mod/contacts.php mod/crepair.php mod/events.php mod/network.php mod/suggest.php mod/uexport.php view/theme/duepuntozero/config.php view/theme/frio/config.php view/theme/quattro/config.php view/theme/vier/config.php		2016-12-20 11:59:13 +01:00
..
fonts	ShaShape font updated	2016-06-01 20:03:56 +02:00
install
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	OStatus: Follow/Unfollow should now work again.	2016-12-18 17:10:38 +00:00
theme	added much more curly braces + space between "if" and brace	2016-12-20 11:59:13 +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