arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-12 01:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bs4

Browse Source 
# 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
This commit is contained in:
FreneticScribbler
2020-04-15 16:22:50 +01:00
parent 5e60675115 3be06a7b25
commit 70995a0d0b
30 changed files with 934 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/templates/asset_detail.html
View File

@@ -25,6 +25,9 @@
<div class="col-md-4 py-3">
{% include 'partials/parent_form.html' %}
</div>
<div class="col-md-4">
{% include 'partials/audit_details.html' %}
</div>
</div>
<div class="row justify-content-end">
{% include 'partials/asset_buttons.html' %}