merged testing into prepare_prod, resolved conflicts

18f27851 · Wolfgang Knopki · 7b89ecd4 · e65f7fc3 · 7b89ecd4 · 18f27851
Commit 18f27851 authored May 21, 2021 by Wolfgang Knopki
--- a/img/help/edit_settings.png
+++ b/img/help/edit_settings.png
--- a/img/help/edit_settings_generic.png
+++ b/img/help/edit_settings_generic.png
--- a/img/help/editnewpage.png
+++ b/img/help/editnewpage.png
--- a/img/help/f_logos.png
+++ b/img/help/f_logos.png
--- a/img/help/generic.png
+++ b/img/help/generic.png
--- a/img/help/menu.png
+++ b/img/help/menu.png
--- a/img/help/partic.png
+++ b/img/help/partic.png
--- a/img/help/partic2.png
+++ b/img/help/partic2.png
--- a/img/help/pr_logo.png
+++ b/img/help/pr_logo.png
--- a/img/help/pr_name.png
+++ b/img/help/pr_name.png
--- a/img/help/publicplus.png
+++ b/img/help/publicplus.png
--- a/img/help/publicplus_generic.png
+++ b/img/help/publicplus_generic.png
--- a/img/help/select_contact.png
+++ b/img/help/select_contact.png
--- a/img/help/select_settings.png
+++ b/img/help/select_settings.png
--- a/img/help/select_settings_generic.png
+++ b/img/help/select_settings_generic.png
--- a/img/help/settings_logo.png
+++ b/img/help/settings_logo.png
--- a/img/help/switches.png
+++ b/img/help/switches.png
--- a/img/hpc/.gitkeep
+++ b/img/hpc/.gitkeep
--- a/img/hpc/acoustic.png
+++ b/img/hpc/acoustic.png
--- a/img/hpc/bwhpc.jpg
+++ b/img/hpc/bwhpc.jpg