clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into api-status

Browse Source
This commit is contained in:
Michael
2021-11-22 07:33:25 +00:00
parent 670bbe58a1 f3bfae1113
commit 214a0524dd
35 changed files with 1809 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
database.sql
View File

@@ -1511,6 +1511,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` (
`blocked` boolean COMMENT 'Contact is completely blocked for this user',
`ignored` boolean COMMENT 'Posts from this contact are ignored',
`collapsed` boolean COMMENT 'Posts from this contact are collapsed',
`hidden` boolean COMMENT 'This contact is hidden from the others',
`pending` boolean COMMENT '',
`rel` tinyint unsigned COMMENT 'The kind of the relation between the user and the contact',
`info` mediumtext COMMENT '',