]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26f62a9 a5f97b2)
Merge remote-tracking branch 'upstream/develop' into bugfix-attachments
authorMichael Vogel <icarus@dabo.de>
Mon, 18 Apr 2016 04:15:29 +0000 (06:15 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 18 Apr 2016 04:15:29 +0000 (06:15 +0200)

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