Merge branch 'inventree:master' into webhooks

This commit is contained in:
Matthias Mair authored and GitHub committed 2022-01-08 21:42:18 +01:00
commit 9e21dde6de
47 files changed
+1095 -446

No files matched your search

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