]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eeec6aa 5246b9c)
Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
authorMichael <heluecht@pirati.ca>
Sun, 12 Sep 2021 12:36:04 +0000 (12:36 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 12 Sep 2021 12:36:04 +0000 (12:36 +0000)
1  2 
src/Model/Item.php patch | diff1 | diff2 | blob | history
src/Module/Contact.php patch | diff1 | diff2 | blob | history

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