friendica/view
Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
Conflicts:
	include/onepoll.php
	include/queue.php
2017-03-12 21:03:44 +00:00
..
fonts
install
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
templates Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 2017-03-12 21:03:44 +00:00
theme Strip @hubzilla.server part from guid for autoscrolling purpuses 2017-03-03 21:45:36 -05:00
.htaccess
custom_tinymce.css
global.css fix oembeded video floating 2017-02-08 02:18:42 +01:00