]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a64b770 0a49b7d)
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
authorMichael Vogel <icarus@dabo.de>
Fri, 15 Jul 2016 18:12:46 +0000 (20:12 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 15 Jul 2016 18:12:46 +0000 (20:12 +0200)

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