]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c93729 6910604)
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
authorMichael Vogel <icarus@dabo.de>
Tue, 1 Dec 2015 16:16:31 +0000 (17:16 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 1 Dec 2015 16:16:31 +0000 (17:16 +0100)

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