rabuzarus 0060e2449e Merge develop into 20170316_-_fix_event_edit ...

Conflicts:
	mod/events.php

2017-03-20 16:46:36 +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 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

move register_adminadd_eml.tpl to view/en/

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

templates

Merge develop into 20170316_-_fix_event_edit

2017-03-20 16:46:36 +01:00

theme

add dop event & fix event edit

2017-03-16 20:15:25 +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

fix oembeded video floating

2017-02-08 02:18:42 +01:00