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: 7ee1eb2 71255d0)

author	Michael Vogel <icarus@dabo.de>
	Tue, 22 Dec 2015 10:25:37 +0000 (11:25 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Tue, 22 Dec 2015 10:25:37 +0000 (11:25 +0100)
commit	307beb47fd4930c665cb7d3032ca4405900af43d
tree	bc4b0b2614f0b3a27070775f38f8cced508a5a02	tree \| snapshot
parent	7ee1eb2978b7e20fabe4a8865e44e96942f55598	commit \| diff
parent	71255d04a2cd075402743260ffc51637b7704db5	commit \| diff

Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment

Conflicts:
include/ostatus.php

boot.php	diff1 \|	diff2 \|	blob \| history
include/auth.php	diff1 \|	diff2 \|	blob \| history
include/delivery.php	diff1 \|	diff2 \|	blob \| history
include/ostatus.php	diff1 \|	diff2 \|	blob \| history
include/session.php	diff1 \|	diff2 \|	blob \| history

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