Merge branch 'main' into dev

2022-03-21 08:36:44 -07:00
parent 682f3fdc3e 4f28225188
commit 98d677dc0b
10 changed files with 330 additions and 109 deletions
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 5, 0)
+__version__ = (1, 6, 0)