]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 23 Mar 2018 10:15:55 +0000 (06:15 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Fri, 23 Mar 2018 10:15:55 +0000 (06:15 -0400)
commit27d94023eef0263a3ce9750f79a73ac941a25304
treea177e89cead517db599b9b8031ec9e192f2a40a4
parent046046e0c46b75ecff69ebeefc469be8a01bd9d3
parentbacc5de3a229ab069db527854adbe6f1e593cd5a
Merge branch 'master' into develop
30 files changed:
CHANGELOG
INSTALL.txt
bin/worker.php
boot.php
database.sql
doc/Developers-Intro.md
doc/FAQ.md
doc/Install.md
doc/de/FAQ.md
doc/de/Install.md
doc/htconfig.md
include/api.php
include/conversation.php
include/enotify.php
index.php
mod/admin.php
mod/display.php
mod/settings.php
src/Content/Text/BBCode.php
src/Core/NotificationsManager.php
src/Core/Worker.php
src/Database/DBStructure.php
src/Model/Contact.php
src/Model/GContact.php
src/Model/User.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/Feed.php
src/Protocol/OStatus.php
src/Protocol/PortableContact.php