Merge branch 'master' into add_stamp_settings

This commit is contained in:
Michael Vetter
2022-04-28 19:33:23 +02:00
committed by GitHub
30 changed files with 636 additions and 325 deletions

View File

@@ -178,6 +178,7 @@ typedef enum {
PREF_SILENCE_NON_ROSTER,
PREF_OUTGOING_STAMP,
PREF_INCOMING_STAMP,
PREF_NOTIFY_ROOM_OFFLINE,
} preference_t;
typedef struct prof_alias_t