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

@@ -2,7 +2,7 @@ from django.utils.deprecation import MiddlewareMixin
from .models import User
class Middleware (MiddlewareMixin):
class Middleware(MiddlewareMixin):
"""
This is a dummy authentication middleware class that creates what
is roughly an Anonymous authenticated user so we can disable login

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",

View File

@@ -1 +1 @@
__version__ = (1, 3, 0)
__version__ = (2, 1, 0)