friendica/view
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
..
fonts ShaShape font updated 2016-06-01 20:03:56 +02:00
install Installer use static css, fix 2015-11-13 10:56:06 +01:00
lang DE translations 2017-05-06 08:56:15 +02:00
php Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 2017-05-11 14:54:26 +02:00
smarty3 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
templates Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 2017-05-11 14:54:26 +02:00
theme Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 2017-05-11 14:54:26 +02:00
.htaccess recreate fix for 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