]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eb461e 8c8ebb4)
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
authorMichael Vogel <icarus@dabo.de>
Fri, 19 Feb 2016 10:55:57 +0000 (11:55 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 19 Feb 2016 10:55:57 +0000 (11:55 +0100)

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