]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1613f2a 15adc5a)
Merge remote-tracking branch 'upstream/develop' into dfrn-2
authorMichael <heluecht@pirati.ca>
Sun, 1 Apr 2018 04:49:28 +0000 (04:49 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 1 Apr 2018 04:49:28 +0000 (04:49 +0000)

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