Roland Haeder 2178feab30 Merge remote-tracking branch 'upstream/develop' into develop

2016-12-21 19:59:38 +01: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 translation of the core

2016-12-19 12:22:47 +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

move register_adminadd_eml.tpl to view/en/

2013-08-08 11:35:12 -04:00

templates

OStatus: Follow/Unfollow should now work again.

2016-12-18 17:10:38 +00:00

theme

Merge remote-tracking branch 'upstream/develop' into develop

2016-12-21 19:59:38 +01: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

Add protocol whitelist for href/src attributes

2016-12-03 14:19:57 -05:00