git.mxchange.org Git - friendica.git/commit - mod/register.php

]> git.mxchange.org Git - friendica.git/commit - mod/register.php

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4f70682 de5a0da)

author	Michael <heluecht@pirati.ca>
	Sun, 11 Jun 2017 07:49:34 +0000 (07:49 +0000)
committer	Michael <heluecht@pirati.ca>
	Sun, 11 Jun 2017 07:49:34 +0000 (07:49 +0000)
commit	06815f1a38409e45b0c5e5184c081f964ec89e47
tree	39e63c4bc5d838d890f32853fea7cfdbe0e84315	tree \| snapshot
parent	4f70682f7ad272543c08d0d46b8554590caa1a30	commit \| diff
parent	de5a0dadb0715198b9ba376e4ab79f58cedef098	commit \| diff

Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster

Conflicts:
include/poller.php

boot.php	diff1 \|	diff2 \|	blob \| history
doc/htconfig.md	diff1 \|	diff2 \|	blob \| history
include/notifier.php	diff1 \|	diff2 \|	blob \| history
include/poller.php	diff1 \|	diff2 \|	blob \| history

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