Merge branch 'inventree:master' into plugin-2037

This commit is contained in:
Matthias Mair authored and GitHub committed 2021-12-02 09:23:05 +01:00
commit 11e527a02a
51 files changed
+14255 -13007

No files matched your search

+1 -1
View File
@@ -146,7 +146,6 @@ class RuleSet(models.Model):
# Core django models (not user configurable)
'admin_logentry',
'contenttypes_contenttype',
'sessions_session',
# Models which currently do not require permissions
'common_colortheme',
@@ -160,6 +159,7 @@ class RuleSet(models.Model):
'error_report_error',
'exchange_rate',
'exchange_exchangebackend',
'user_sessions_session',
# Django-q
'django_q_ormq',