]> git.mxchange.org Git - friendica.git/commit
Merge branch 'rewrites/app_get_baseurl_static' into develop
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:37:23 +0000 (11:37 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:37:23 +0000 (11:37 +0100)
commit20e71d21a6206c03f2137eb82edf8f8b3bc644f2
tree88a72e2fe9ad428f6d2921eb294ddc389a123810
parentc0df692f5fc4eaadb322614069b2c7ed40453fa1
parentad20c5504deba9dbb4ea5c5deba598f2c448b344
Merge branch 'rewrites/app_get_baseurl_static' into develop

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/editpost.php
mod/events.php
mod/install.php
mod/lostpass.php
mod/network.php
mod/notify.php
mod/suggest.php
mod/uexport.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
include/diaspora.php
mod/crepair.php
mod/dfrn_confirm.php
mod/install.php
mod/network.php
mod/suggest.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/quattro/config.php