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

..

asset_buttons.html

Merge branch 'master' into bs4

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

asset_detail_form.html

Merge branch 'master' into bs4

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

asset_list_table.html

Merge branch 'master' into bs4

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

asset_picker.html

Asset list/CRUD template updates

2020-03-16 21:45:04 +00:00

audit_details.html

Create initial asset audit framework (#403)

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

cable_form.html

Merge branch 'master' into bs4

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

parent_form.html

Asset list/CRUD template updates

2020-03-16 21:45:04 +00:00

purchasedetails_form.html

Asset form fixes

2020-04-06 15:17:14 +01:00