]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47ca5bb 8315940)
Merge remote-tracking branch 'upstream/develop' into item-thread
authorMichael <heluecht@pirati.ca>
Fri, 19 Oct 2018 03:19:34 +0000 (03:19 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 19 Oct 2018 03:19:34 +0000 (03:19 +0000)
1  2 
mod/community.php patch | diff1 | diff2 | blob | history

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