]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33c0aba 1c5348d)
Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments
authorMichael Vogel <icarus@dabo.de>
Wed, 31 Dec 2014 14:45:51 +0000 (15:45 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 31 Dec 2014 14:45:51 +0000 (15:45 +0100)

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