]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 095fa87 860f11e)
Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type
authorMichael Vogel <ike@pirati.ca>
Tue, 4 Oct 2016 03:52:22 +0000 (03:52 +0000)
committerMichael Vogel <ike@pirati.ca>
Tue, 4 Oct 2016 03:52:22 +0000 (03:52 +0000)

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