]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fc1e47 02123bd)
Merge remote-tracking branch 'upstream/develop' into ocr
authorMichael <heluecht@pirati.ca>
Sun, 14 Jan 2024 18:33:02 +0000 (18:33 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 14 Jan 2024 18:33:02 +0000 (18:33 +0000)
1  2 
composer.json patch | diff1 | diff2 | blob | history
composer.lock patch | diff1 | diff2 | blob | history

diff --cc composer.json
Simple merge
diff --cc composer.lock
Simple merge
Unnamed repository; edit this file 'description' to name the repository.