]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e61ed38 f70f0ac)
Merge remote-tracking branch 'upstream/develop' into dfrn-rework
authorMichael <heluecht@pirati.ca>
Sun, 22 Apr 2018 07:45:28 +0000 (07:45 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 22 Apr 2018 07:45:28 +0000 (07:45 +0000)

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