FreneticScribbler 70995a0d0b Merge branch 'master' into bs4 ...

# Conflicts:
#	assets/models.py
#	assets/templates/asset_update.html
#	assets/templates/partials/asset_buttons.html
#	assets/templates/partials/asset_list_table_body.html
#	assets/views.py
#	templates/base_assets.html

2020-04-15 16:28:44 +01:00

..

management

Create initial asset audit framework (#403)

2020-04-14 21:11:09 +01:00

migrations

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

templates

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

tests

Create initial asset audit framework (#403)

2020-04-14 21:11:09 +01:00

__init__.py

Create the Asset Database (#363)

2019-12-04 23:14:27 +00:00

admin.py

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

forms.py

Create initial asset audit framework (#403)

2020-04-14 21:11:09 +01:00

models.py

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

urls.py

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

views.py

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00