]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94977cc 51155d7)
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
authorMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 23:29:01 +0000 (23:29 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 23:29:01 +0000 (23:29 +0000)

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