Merge branch 'dev' into feature-permissions

2023-01-24 14:10:45 -08:00
parent 0cfa5211e9 64eabbe8d0
commit 44f860d9b0
49 changed files with 5354 additions and 6219 deletions
--- a/src-ui/src/app/data/paperless-mail-rule.ts
+++ b/src-ui/src/app/data/paperless-mail-rule.ts
@@ -36,6 +36,8 @@ export interface PaperlessMailRule extends ObjectWithId {

  account: number // PaperlessMailAccount.id

+  order: number
+
  folder: string

  filter_from: string