Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonas Winkler
2018-07-10 15:46:46 +02:00
18 changed files with 618 additions and 418 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,12 +67,12 @@ 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",
"crispy_forms",
"django_filters"
"django_filters",
]

View File

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