Hypolite Petovan 88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src ...

# Conflicts:
#	doc/htconfig.md

2016-12-07 23:15:46 -05: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

Update DE translation THX Rabuzarus

2016-12-03 10:09:40 +01:00

php

add possibility to load custom page templates + none.php pagetemplate is part of core now

2016-07-11 10:33:39 +02:00

smarty3

move register_adminadd_eml.tpl to view/en/

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

templates

show some of the worker options only when the worker process is active

2016-12-06 21:47:37 +01:00

theme

Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content

2016-12-06 22:05:08 +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