Merge branch 'develop' into 'feature/meeting_document_types'

# Conflicts:
#   electron/main/script.js
#   main.js
This commit is contained in:
Hughes, Mike
2025-12-16 15:40:27 +01:00
8 changed files with 151 additions and 136 deletions
+1 -6
View File
@@ -147,12 +147,7 @@
</div>
<div class="step" id="step6" style="display:none;">
<button class="download-btn" id="downloadButton" onclick="" disabled>Download</button>
<div class="progressbar" id="progressbar">
<div class="progress_fill"></div>
<span class="progress_text">0%</span>
</div>
<button class="download-btn" id="downloadButton" onclick="fileDownload()">Download</button>
</div>
</div>