friendica/view/theme
rabuzarus ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
2017-04-03 00:51:34 +02:00
..
duepuntozero Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
frio Merge develop into 20170321_-_frio-fbbrowser 2017-04-03 00:51:34 +02:00
frost "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
frost-mobile "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
quattro Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
smoothly Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
vier Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00