git.mxchange.org Git - friendica.git/commit - doc/img/mic.png

]> git.mxchange.org Git - friendica.git/commit - doc/img/mic.png

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 385ee5a 2093fa8)

author	Fabrixxm <fabrix.xm@gmail.com>
	Mon, 5 Nov 2012 08:37:58 +0000 (09:37 +0100)
committer	Fabrixxm <fabrix.xm@gmail.com>
	Mon, 5 Nov 2012 08:37:58 +0000 (09:37 +0100)
commit	5b4944fe8e951776542a0401a6766e92ff384020
tree	0a21154a8654ec02e302ed6ebf66d14fb006abd1	tree \| snapshot
parent	385ee5a86207106408a20a3d2ec6dbeb3a313238	commit \| diff
parent	2093fa8b3fc421bb851bede29c1b4f0ff6c02b59	commit \| diff

Merge remote-tracking branch 'remotes/friendica/master' into moveme

boot.php	diff1 \|	diff2 \|	blob \| history
include/delivery.php	diff1 \|	diff2 \|	blob \| history
include/items.php	diff1 \|	diff2 \|	blob \| history
include/notifier.php	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	diff1 \|	diff2 \|	blob \| history
include/poller.php	diff1 \|	diff2 \|	blob \| history
mod/dfrn_notify.php	diff1 \|	diff2 \|	blob \| history

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