]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0dc1c93 d2f2e1c)
Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2
authorMichael <heluecht@pirati.ca>
Fri, 16 Jun 2017 06:10:35 +0000 (06:10 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 16 Jun 2017 06:10:35 +0000 (06:10 +0000)

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