]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 1 Jun 2018 11:30:04 +0000 (07:30 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Fri, 1 Jun 2018 11:30:04 +0000 (07:30 -0400)
commit93daf7883e98d797759fb81dbf12e9e368debf61
tree8d4c0deb90179bc39d82256b59f68e58362ea87a
parent3341deee6a8ddcb3fd651e22b9abacb63ff70b45
parent6d20785005c22784f1a09120dc94c3a5372d6532
Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
19 files changed:
VERSION
boot.php
database.sql
doc/Home.md
doc/de/Home.md
include/api.php
include/conversation.php
include/dba.php
include/items.php
include/text.php
mod/admin.php
mod/events.php
mod/photos.php
src/Core/Worker.php
src/Database/DBStructure.php
src/Model/Item.php
src/Protocol/DFRN.php
src/Protocol/OStatus.php
src/Protocol/PortableContact.php