]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 146dc5c 9ad7af6)
Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url
authorMichael Vogel <icarus@dabo.de>
Sun, 17 Apr 2016 09:55:51 +0000 (11:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 17 Apr 2016 09:55:51 +0000 (11:55 +0200)

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