]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b22296d 42f4f3f)
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check
authorMichael Vogel <icarus@dabo.de>
Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)

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