Hypolite Petovan 30a77cc10a Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme ... # Conflicts: # view/theme/frio/theme.php		2017-01-11 09:39:38 +11:00
..
fonts	…
install	…
lang	DE translations THX Rabuzarus	2017-01-03 10:42:11 +01:00
php	…
smarty3	…
templates	Show mobile theme selection only if mobile themes are available (default template)	2017-01-07 00:22:22 +01:00
theme	Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme	2017-01-11 09:39:38 +11:00
.htaccess	…
custom_tinymce.css	…
global.css	…