]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a182dd3 1a8d0a5)
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
authorMichael <heluecht@pirati.ca>
Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)

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