]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87ade53 40bff1a)
Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
authorMichael Vogel <icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)

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