arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into training

Browse Source 
# Conflicts:
#	RIGS/models.py
This commit is contained in:
FreneticScribbler
2022-01-14 18:03:56 +00:00
parent 9f68a6017e 2ddc8923ba
commit fcff722260
9 changed files with 94 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/models.py
View File

@@ -6,7 +6,8 @@ from django.urls import reverse
from reversion import revisions as reversion
from reversion.models import Version
from RIGS.models import RevisionMixin, Profile
from RIGS.models import Profile
from versioning.versioning import RevisionMixin
class AssetCategory(models.Model):