Merge branch 'master' into 'SDC-470'

# Conflicts: # atdb/taskdatabase/services/algorithms.py

Merge branch 'master' into 'SDC-470'
2c4ae5c0 · Roy de Goei · ccbab5fa · a6c7d1bb · ccbab5fa · 2c4ae5c0
Commit 2c4ae5c0 authored 3 years ago by Roy de Goei
--- a/atdb/docs/ATDB-LDV Data Model.png
+++ b/atdb/docs/ATDB-LDV Data Model.png
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -80,7 +80,7 @@
        {% include 'taskdatabase/pagination.html' %}
       </div>
    </div>
-    <p class="footer"> Version 1.0.0 (21 jan 2021 - 19:00)
+    <p class="footer"> Version 1.0.0 (24 jan 2021 - 10:00)

 </div>