]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d30f2b a91ce7c)
Merge branch 'master' of github.com:annando/friendica
authorMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)

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