]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37bd034 7ac7cae)
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
authorMichael Vogel <icarus@dabo.de>
Fri, 4 Dec 2015 06:07:34 +0000 (07:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 4 Dec 2015 06:07:34 +0000 (07:07 +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.