Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201

This commit is contained in:
Matthias committed 2021-12-08 18:31:33 +01:00
commit 3a3f8ba4ef
75 files changed
+3065 -338

No files matched your search

+1
View File
@@ -76,6 +76,7 @@ class RuleSet(models.Model):
'otp_totp_totpdevice',
'otp_static_statictoken',
'otp_static_staticdevice',
'plugin_pluginconfig'
],
'part_category': [
'part_partcategory',