]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e2c2cd a60467e)
Merge remote-tracking branch 'upstream/develop' into api-tags
authorMichael <heluecht@pirati.ca>
Mon, 28 Nov 2022 02:13:20 +0000 (02:13 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 28 Nov 2022 02:13:20 +0000 (02:13 +0000)
1  2 
static/routes.config.php patch | diff1 | diff2 | blob | history

diff --cc static/routes.config.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.