Commit Graph

2 Commits

Author SHA1 Message Date
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
88b34740f6 Asset list/CRUD template updates 2020-03-16 21:45:04 +00:00