]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6d51e0 95945ec)
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
authorMichael Vogel <icarus@dabo.de>
Mon, 6 Jul 2015 15:35:48 +0000 (17:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 6 Jul 2015 15:35:48 +0000 (17:35 +0200)

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