Reisub Repositorio Git - friendica.git/.git/commit

https://reisub.nsupdate.info/git / friendica.git / .git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3341dee 6d20785)

author	Hypolite Petovan <mrpetovan@gmail.com>
	Fri, 1 Jun 2018 11:30:04 +0000 (07:30 -0400)
committer	Hypolite Petovan <mrpetovan@gmail.com>
	Fri, 1 Jun 2018 11:30:04 +0000 (07:30 -0400)
commit	93daf7883e98d797759fb81dbf12e9e368debf61
tree	8d4c0deb90179bc39d82256b59f68e58362ea87a	tree \| snapshot
parent	3341deee6a8ddcb3fd651e22b9abacb63ff70b45	commit \| diff
parent	6d20785005c22784f1a09120dc94c3a5372d6532	commit \| diff

Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number

19 files changed:

VERSION	diff1 \|	diff2 \|	blob \| history
boot.php	diff1 \|	diff2 \|	blob \| history
database.sql	diff1 \|	diff2 \|	blob \| history
doc/Home.md	diff1 \|	diff2 \|	blob \| history
doc/de/Home.md	diff1 \|	diff2 \|	blob \| history
include/api.php	diff1 \|	diff2 \|	blob \| history
include/conversation.php	diff1 \|	diff2 \|	blob \| history
include/dba.php	diff1 \|	diff2 \|	blob \| history
include/items.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
mod/admin.php	diff1 \|	diff2 \|	blob \| history
mod/events.php	diff1 \|	diff2 \|	blob \| history
mod/photos.php	diff1 \|	diff2 \|	blob \| history
src/Core/Worker.php	diff1 \|	diff2 \|	blob \| history
src/Database/DBStructure.php	diff1 \|	diff2 \|	blob \| history
src/Model/Item.php	diff1 \|	diff2 \|	blob \| history
src/Protocol/DFRN.php	diff1 \|	diff2 \|	blob \| history
src/Protocol/OStatus.php	diff1 \|	diff2 \|	blob \| history
src/Protocol/PortableContact.php	diff1 \|	diff2 \|	blob \| history

mirror https://github.com/friendica/friendica.git