]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d4c99e 26463d9)
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
authorMichael Vogel <icarus@dabo.de>
Thu, 18 Feb 2016 07:15:58 +0000 (08:15 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 18 Feb 2016 07:15:58 +0000 (08:15 +0100)

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