Merge branch 'dev' into 'master'

Dev See merge request !1

Merge branch 'dev' into 'master'
Dev See merge request !1
018eb67c · Kutzner · 72a047f7 · aaee7220 · 018eb67c · 018eb67c
Commit 018eb67c authored 3 years ago by Kutzner
Hide whitespace changes
Inline Side-by-side

Showing

with 24 additions and 0 deletions
+24 -0
--- a/public/assets/images/Herbst.jpg
+++ b/public/assets/images/Herbst.jpg
--- a/public/assets/images/Jochim.jpg
+++ b/public/assets/images/Jochim.jpg
--- a/public/settings.js
+++ b/public/settings.js
@@ -189,6 +189,30 @@ let settings = {
          profile: "https://www.hft-stuttgart.de/p/hadi-adineh"
        }
      ]
+    },
+    {
+      name: "Tim Herbst",
+      avatar: `${BASE_URL}/assets/images/Herbst.jpg`,
+      email: "tim.herbst@hft-stuttgart.de",
+      social: [
+        {
+          agent: "webpage",
+          icon: DEFAULT.social.webpage.icon,
+          profile: "https://www.hft-stuttgart.de"
+        }
+      ]
+    },
+    {
+      name: "Niko Jochim",
+      avatar: `${BASE_URL}/assets/images/Jochim.jpg`,
+      email: "niko.jochim@hft-stuttgart.de",
+      social: [
+        {
+          agent: "webpage",
+          icon: DEFAULT.social.webpage.icon,
+          profile: "https://www.hft-stuttgart.de"
+        }
+      ]
    }    
  ],