Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon ... Conflicts: include/bbcode.php		2017-04-20 05:44:31 +00:00
..
fonts	…
install	…
lang	RU translations THX pztrn	2017-04-09 07:35:12 +02:00
php	…
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	…
custom_tinymce.css	…
global.css	…