Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons ... # Conflicts: # view/theme/frio/js/filebrowser.js # view/theme/frio/templates/filebrowser.tpl		2017-03-25 20:27:26 -04:00
..
fonts
install
lang	DE translations	2017-03-05 12:40:31 +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	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
templates	"no_utf" wasn't in use anymore - it is now removed completely	2017-03-25 10:51:00 +00:00
theme	Merge branch 'develop' into improvement/frio-action-links-to-buttons	2017-03-25 20:27:26 -04:00
.htaccess
custom_tinymce.css
global.css	Fix filebrowser display	2017-03-17 20:26:40 -04:00