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
..
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	ES translation THX Albert	2017-03-27 22:06:56 +02: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	Issue 3142: mcrypt is no more (as well as phpseclib)	2017-04-01 08:28:42 +00:00
theme	Merge develop into 20170321_-_frio-fbbrowser	2017-04-03 00:51:34 +02: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