Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon ... Conflicts: include/bbcode.php		2017-04-20 05:44:31 +00: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	RU translations THX pztrn	2017-04-09 07:35:12 +02: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	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
templates	Merge remote-tracking branch 'upstream/develop' into 1704-mastodon	2017-04-20 05:44:31 +00:00
theme	Merge pull request #3326 from Alkarex/utf8mb4	2017-04-20 05:28:16 +02: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	Fix filebrowser display	2017-03-17 20:26:40 -04:00