]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8397ccf 8b3a9fc)
Merge remote-tracking branch 'upstream/develop' into diaspora-reshare
authorMichael <heluecht@pirati.ca>
Tue, 20 Dec 2022 06:58:36 +0000 (06:58 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 20 Dec 2022 06:58:36 +0000 (06:58 +0000)
1  2 
database.sql patch | diff1 | diff2 | blob | history
src/Protocol/Diaspora.php patch | diff1 | diff2 | blob | history

diff --cc database.sql
Simple merge
diff --cc src/Protocol/Diaspora.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.