Merge branch 'master' into webdav

This commit is contained in:
Jonas Winkler
2018-07-11 15:02:50 +02:00
18 changed files with 617 additions and 417 deletions

View File

@@ -67,7 +67,7 @@ INSTALLED_APPS = [
"reminders.apps.RemindersConfig",
"paperless_tesseract.apps.PaperlessTesseractConfig",
"flat_responsive",
"flat_responsive", # TODO: Remove as of Django 2.x
"django.contrib.admin",
"rest_framework",