]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26d5746 ecc76c6)
Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments
authorMichael Vogel <icarus@dabo.de>
Thu, 1 Jan 2015 13:53:13 +0000 (14:53 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 1 Jan 2015 13:53:13 +0000 (14:53 +0100)

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