Merge branch 'main' into change_password

This commit is contained in:
Dessalines 2021-04-07 16:35:02 -04:00
commit d601200a12
2 changed files with 2 additions and 2 deletions

View file

@ -46,7 +46,7 @@ export interface SaveUserSettings {
lang: string; lang: string;
avatar?: string; avatar?: string;
banner?: string; banner?: string;
preferred_username?: string; // The display name display_name?: string;
email?: string; email?: string;
bio?: string; bio?: string;
matrix_user_id?: string; matrix_user_id?: string;

View file

@ -14,7 +14,7 @@ export interface LocalUserSettings {
export interface PersonSafe { export interface PersonSafe {
id: number; id: number;
name: string; name: string;
preferred_username?: string; display_name?: string;
avatar?: string; avatar?: string;
banned: boolean; banned: boolean;
published: string; published: string;