Merge branch 'master' into shib-auth

26a327a7 · Lubomir Dolezal · 9e041837 · 2021a130 · 26a327a7 · 26a327a7
Commit 26a327a7 authored 4 years ago by Lubomir Dolezal
--- a/docker-compose.dem.yml
+++ b/docker-compose.dem.yml
--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
--- a/docker-compose.emg.yml
+++ b/docker-compose.emg.yml
--- a/docker-compose.logging.yml
+++ b/docker-compose.logging.yml
--- a/docker-compose.vhr18.ops.yml
+++ b/docker-compose.vhr18.ops.yml
--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
--- a/documentation/operator-guide/configuration.rst
+++ b/documentation/operator-guide/configuration.rst
--- a/documentation/operator-guide/images/architecture.png
+++ b/documentation/operator-guide/images/architecture.png
--- a/documentation/operator-guide/images/favicon.ico
+++ b/documentation/operator-guide/images/favicon.ico
--- a/documentation/operator-guide/intro.rst
+++ b/documentation/operator-guide/intro.rst
--- a/documentation/user-guide/images/arcgis_0.jpg
+++ b/documentation/user-guide/images/arcgis_0.jpg
--- a/documentation/user-guide/images/arcgis_1.jpg
+++ b/documentation/user-guide/images/arcgis_1.jpg
--- a/documentation/user-guide/images/arcgis_2.jpg
+++ b/documentation/user-guide/images/arcgis_2.jpg
--- a/documentation/user-guide/images/arcgis_3.jpg
+++ b/documentation/user-guide/images/arcgis_3.jpg
--- a/documentation/user-guide/images/arcgis_4.jpg
+++ b/documentation/user-guide/images/arcgis_4.jpg
--- a/documentation/user-guide/images/arcgis_5.jpg
+++ b/documentation/user-guide/images/arcgis_5.jpg
--- a/documentation/user-guide/images/arcgis_6.jpg
+++ b/documentation/user-guide/images/arcgis_6.jpg
--- a/documentation/user-guide/images/arcgis_7.jpg
+++ b/documentation/user-guide/images/arcgis_7.jpg
--- a/documentation/user-guide/images/arcgis_8.jpg
+++ b/documentation/user-guide/images/arcgis_8.jpg
--- a/documentation/user-guide/images/arcgis_9.jpg
+++ b/documentation/user-guide/images/arcgis_9.jpg