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: 4de0578 7d1e546)

author	Michael <heluecht@pirati.ca>
	Sun, 12 Mar 2017 21:03:44 +0000 (21:03 +0000)
committer	Michael <heluecht@pirati.ca>
	Sun, 12 Mar 2017 21:03:44 +0000 (21:03 +0000)
commit	77e8c44016a5c327e61e93724b8921cfd600b66c
tree	0596b5115be41e09d5a10bb36ed91fa69f1d06f3	tree \| snapshot
parent	4de057804c0292da7fa92688fd3d29f33adf35f9	commit \| diff
parent	7d1e54664a141919864e8b7dfa2ee4f4307fe6ad	commit \| diff

Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Conflicts:
include/onepoll.php
include/queue.php

boot.php	diff1 \|	diff2 \|	blob \| history
include/delivery.php	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	diff1 \|	diff2 \|	blob \| history
include/poller.php	diff1 \|	diff2 \|	blob \| history

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