mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-12-07 23:35:22 +01:00
Merge @dadosch's changes & fix dependency conflicts
This commit is contained in:
commit
2d4008371b
14 changed files with 33 additions and 30 deletions
|
|
@ -10,7 +10,10 @@ from collections import OrderedDict
|
|||
from fuzzywuzzy import fuzz
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
try:
|
||||
from django.core.urlresolvers import reverse
|
||||
except ImportError:
|
||||
from django.urls import reverse
|
||||
from django.db import models
|
||||
from django.template.defaultfilters import slugify
|
||||
from django.utils import timezone
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue