]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc250bb 3bf789d)
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
authorMichael Vogel <icarus@dabo.de>
Fri, 27 Nov 2015 06:30:03 +0000 (07:30 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 27 Nov 2015 06:30:03 +0000 (07:30 +0100)

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