]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12c034f c9e07fa)
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
authorMichael Vogel <icarus@dabo.de>
Sat, 2 May 2015 19:47:34 +0000 (21:47 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 2 May 2015 19:47:34 +0000 (21:47 +0200)

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