Skip to content
Snippets Groups Projects
Verified Commit 2e5ee8de authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch 'master' into 25-roles-and-permissions

parents 8e597c57 11f240c9
No related branches found
No related tags found
1 merge request!207Resolve "Roles and permissions"
Pipeline #1601 failed
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
AlekSIS-App-DashboardFeeds @ dc6d80c0
Compare bbf946c3...dc6d80c0
Subproject commit bbf946c3c91d94d425889a1bcc6436acb7f1819d
Subproject commit dc6d80c09193910bf27533ac7d6877839fb62c50
pyproject.toml
+ 1
− 1
View file @ 2e5ee8de
......@@ -67,9 +67,9 @@ django-polymorphic = "^2.1.2"
django-otp = "0.7.5"
django-colorfield = "^0.2.1"
django-bleach = "^0.6.1"
django-memoize = "^2.2.1"
django-guardian = "^2.2.0"
rules = "^2.2"
django-cache-memoize = "^0.1.6"
django-haystack = {version="3.0b1", allows-prereleases = true}
celery-haystack = {version="^0.3.1", optional=true}
django-dbbackup = "^3.3.0"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment