]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 220c910 d21108f)
Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes
authorMichael <heluecht@pirati.ca>
Tue, 30 Nov 2021 05:48:03 +0000 (05:48 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 30 Nov 2021 05:48:03 +0000 (05:48 +0000)
1  2 
include/api.php patch | diff1 | diff2 | blob | history
view/lang/C/messages.po patch | diff1 | diff2 | blob | history

diff --cc include/api.php
Simple merge
diff --cc view/lang/C/messages.po
Simple merge
Unnamed repository; edit this file 'description' to name the repository.