Merge branch 'develop' into 'master'

Regular merge of develop See merge request R3/labCards!10

Merge branch 'develop' into 'master'
Regular merge of develop See merge request R3/labCards!10
4b2d479f · Laurent Heirendt · 94dd9500 · 460e6b6c · 4b2d479f · 4b2d479f
Commit 4b2d479f authored 5 years ago by Laurent Heirendt
--- a/external/daisy/images/datadec_other.png
+++ b/external/daisy/images/datadec_other.png
--- a/external/daisy/images/datadec_quick_form.png
+++ b/external/daisy/images/datadec_quick_form.png
--- a/external/daisy/images/dataset_access_other_project.png
+++ b/external/daisy/images/dataset_access_other_project.png
--- a/external/daisy/images/dataset_add_access.png
+++ b/external/daisy/images/dataset_add_access.png
--- a/external/daisy/images/dataset_add_access_form.png
+++ b/external/daisy/images/dataset_add_access_form.png
--- a/external/daisy/images/dataset_add_location.png
+++ b/external/daisy/images/dataset_add_location.png
--- a/external/daisy/images/dataset_add_location_form.png
+++ b/external/daisy/images/dataset_add_location_form.png
--- a/external/daisy/images/dataset_details.png
+++ b/external/daisy/images/dataset_details.png
--- a/external/daisy/images/dataset_menubar.png
+++ b/external/daisy/images/dataset_menubar.png
--- a/external/daisy/images/dataset_quick_form.png
+++ b/external/daisy/images/dataset_quick_form.png
--- a/external/daisy/images/dataset_remove_access.png
+++ b/external/daisy/images/dataset_remove_access.png
--- a/external/daisy/images/dataset_remove_location.png
+++ b/external/daisy/images/dataset_remove_location.png
--- a/external/daisy/images/dependencies.png
+++ b/external/daisy/images/dependencies.png
--- a/external/daisy/images/details_page.png
+++ b/external/daisy/images/details_page.png
--- a/external/daisy/images/editor_form.png
+++ b/external/daisy/images/editor_form.png
--- a/external/daisy/images/from_existing_topology.png
+++ b/external/daisy/images/from_existing_topology.png
--- a/external/daisy/images/login.png
+++ b/external/daisy/images/login.png
--- a/external/daisy/images/menubar.png
+++ b/external/daisy/images/menubar.png
--- a/external/daisy/images/newly_incoming_topology.png
+++ b/external/daisy/images/newly_incoming_topology.png
--- a/external/daisy/images/other_topology.png
+++ b/external/daisy/images/other_topology.png