]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ccc674 b41d14a)
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
authorMichael Vogel <icarus@dabo.de>
Mon, 2 Feb 2015 21:08:40 +0000 (22:08 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 2 Feb 2015 21:08:40 +0000 (22:08 +0100)

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