Merge branch 'master' into training

Browse Source

# Conflicts:
#	RIGS/templates/risk_assessment_form.html
#	templates/base.html

...

This commit is contained in:

FreneticScribbler

2021-10-08 18:40:39 +01:00

parent 081c33ebc8 d3391d9e3e

commit 55558d1a4a

36 changed files with 592 additions and 437 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

RIGS/static/imgs/square_logo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

RIGS/static/imgs/wof2014-1-small.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 164 KiB