1
1
Fork 0
friendica_2019-12_sharedHos.../view
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 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 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 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