projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d6717d a565406)
Merge pull request #6325 from annando/always-magic
authorHypolite Petovan <hypolite@mrpetovan.com>
Tue, 25 Dec 2018 21:16:03 +0000 (16:16 -0500)
committerGitHub <noreply@github.com>
Tue, 25 Dec 2018 21:16:03 +0000 (16:16 -0500)
Always use magic on the same server


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