]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b5f1ef 66458d7)
Merge remote-tracking branch 'upstream/develop' into issue-2864
authorMichael <heluecht@pirati.ca>
Wed, 7 Jun 2017 18:17:37 +0000 (18:17 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 7 Jun 2017 18:17:37 +0000 (18:17 +0000)

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