]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9af3f5b 1490f2d)
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
authorMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 17:13:07 +0000 (17:13 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 17:13:07 +0000 (17:13 +0000)
1  2 
include/diaspora.php patch | diff1 | diff2 | blob | history

diff --cc include/diaspora.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.