]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b763c81 9a22b48)
Merge remote-tracking branch 'upstream/develop' into 1505-ostatus
authorMichael Vogel <icarus@dabo.de>
Fri, 29 May 2015 08:55:07 +0000 (10:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 29 May 2015 08:55:07 +0000 (10:55 +0200)

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