]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cc362f 974564f)
Merge remote-tracking branch 'upstream/develop' into json-ld
authorMichael <heluecht@pirati.ca>
Sat, 16 Jul 2022 09:33:24 +0000 (09:33 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 16 Jul 2022 09:33:24 +0000 (09:33 +0000)
1  2 
static/defaults.config.php patch | diff1 | diff2 | blob | history

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