]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28f8bee 33c943a)
Merge remote-tracking branch 'upstream/develop' into daemon
authorMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)

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