]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b710c8b eb1f21d)
Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown
authorMichael Vogel <icarus@dabo.de>
Mon, 23 Feb 2015 11:34:32 +0000 (12:34 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 23 Feb 2015 11:34:32 +0000 (12:34 +0100)

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