]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 670bbe5 f3bfae1)
Merge remote-tracking branch 'upstream/develop' into api-status
authorMichael <heluecht@pirati.ca>
Mon, 22 Nov 2021 07:33:25 +0000 (07:33 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 22 Nov 2021 07:33:25 +0000 (07:33 +0000)
1  2 
database.sql patch | diff1 | diff2 | blob | history

diff --cc database.sql
Simple merge
Unnamed repository; edit this file 'description' to name the repository.