Merge branch 'master' into subhire

# Conflicts:
#	Pipfile
#	Pipfile.lock
#	package-lock.json
This commit is contained in:
2022-11-21 11:39:25 +00:00
31 changed files with 4137 additions and 3658 deletions

View File

@@ -84,7 +84,7 @@
bulletFontSize="10"/>
</stylesheet>
<template > {# Note: page is 595x842 points (1 point=1/72in) #}
<template title="{{filename}}"> {# Note: page is 595x842 points (1 point=1/72in) #}
<pageTemplate id="Headed" >
<pageGraphics>
<image file="static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>