]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b5ea74 e146b42)
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
authorMichael Vogel <icarus@dabo.de>
Thu, 26 Nov 2015 10:46:58 +0000 (11:46 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 26 Nov 2015 10:46:58 +0000 (11:46 +0100)
1  2 
include/ostatus.php patch | diff1 | diff2 | blob | history

diff --cc include/ostatus.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.