paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge error

Browse Source
This commit is contained in:
Jonas Winkler 2018-09-06 10:15:15 +02:00
parent d26f940a91
commit 04bf5fc094
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/documents/admin.py
View File

@ -4,12 +4,13 @@ from django.conf import settings
from django.contrib import admin, messages from django.contrib import admin, messages
from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.http import HttpResponseRedirect
try: try:
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
except ImportError: except ImportError:
from django.urls import reverse from django.urls import reverse
from django.templatetags.static import static from django.templatetags.static import static
from django.utils.html import format_html from django.utils.html import format_html, format_html_join
from django.utils.http import urlquote from django.utils.http import urlquote
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.db import models from django.db import models