]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d7e2e7 b888382)
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
authorMichael Vogel <icarus@dabo.de>
Tue, 24 Nov 2015 08:38:46 +0000 (09:38 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 24 Nov 2015 08:38:46 +0000 (09:38 +0100)

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