]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bac6016 bcf9fa1)
Merge remote-tracking branch 'upstream/develop' into update-self
authorMichael <heluecht@pirati.ca>
Sat, 24 Mar 2018 22:50:14 +0000 (22:50 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 24 Mar 2018 22:50:14 +0000 (22:50 +0000)
1  2 
mod/settings.php patch | diff1 | diff2 | blob | history
src/Model/Contact.php patch | diff1 | diff2 | blob | history

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