git.mxchange.org Git - friendica.git/commit

]> git.mxchange.org Git - friendica.git/commit

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 87b513d 12cc5f8)

author	Hypolite Petovan <mrpetovan@gmail.com>
	Sun, 7 May 2017 16:58:11 +0000 (12:58 -0400)
committer	GitHub <noreply@github.com>
	Sun, 7 May 2017 16:58:11 +0000 (12:58 -0400)
commit	86cae070f2a048e553c545caec54be72c1c14da5
tree	3264a6a8d3242a21e572b4e4f718b7a0bfaa9bad	tree \| snapshot
parent	87b513dd0323a3345a6f2e86a49bbca316c9b3bb	commit \| diff
parent	12cc5f8360504988a09ae0313163f7d19bead2bb	commit \| diff

Merge branch 'develop' into improvement/move-app-to-src-2

12 files changed:

boot.php	diff1 \|	diff2 \|	blob \| history
include/Probe.php	diff1 \|	diff2 \|	blob \| history
include/acl_selectors.php	diff1 \|	diff2 \|	blob \| history
include/api.php	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	diff1 \|	diff2 \|	blob \| history
include/diaspora.php	diff1 \|	diff2 \|	blob \| history
include/ostatus.php	diff1 \|	diff2 \|	blob \| history
include/pubsubpublish.php	diff1 \|	diff2 \|	blob \| history
include/socgraph.php	diff1 \|	diff2 \|	blob \| history
mod/admin.php	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	diff1 \|	diff2 \|	blob \| history
mod/receive.php	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.