]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fe6156 c41b87f)
Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus
authorMichael Vogel <icarus@dabo.de>
Mon, 24 Aug 2015 17:22:05 +0000 (19:22 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 24 Aug 2015 17:22:05 +0000 (19:22 +0200)

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