]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a497bd3 bfeaa56)
Merge remote-tracking branch 'upstream/develop' into logging
authorMichael <heluecht@pirati.ca>
Mon, 25 Oct 2021 18:56:29 +0000 (18:56 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 25 Oct 2021 18:56:29 +0000 (18:56 +0000)
1  2 
src/Model/Contact.php patch | diff1 | diff2 | blob | history
src/Model/Event.php patch | diff1 | diff2 | blob | history

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