Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/ugl/website.git

Conflicts: public/index.html readme.md

Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/ugl/website.git
Conflicts: public/index.html readme.md
5ac9f1cc · Patrick · d47eca70 · 2f0ba2b5 · 5ac9f1cc · 5ac9f1cc
Commit 5ac9f1cc authored 3 years ago by Patrick
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 0 deletions
+0 -0
--- a/public/content/Citation Sheet2.xlsx
+++ b/public/content/Citation Sheet2.xlsx
--- a/public/content/CitationSheet3.xlsx
+++ b/public/content/CitationSheet3.xlsx
--- a/public/img/Abdul_Rahman 2019_10.JPG
+++ b/public/img/Abdul_Rahman 2019_10.JPG
--- a/public/img/Agugiaro_2018_03.JPG
+++ b/public/img/Agugiaro_2018_03.JPG
--- a/public/img/BAO 2020_07.JPG
+++ b/public/img/BAO 2020_07.JPG
--- a/public/img/BAO_2020_07.JPG
+++ b/public/img/BAO_2020_07.JPG
--- a/public/img/Coors 2020_02.JPG
+++ b/public/img/Coors 2020_02.JPG
--- a/public/img/Coors_2019_03.JPG
+++ b/public/img/Coors_2019_03.JPG
--- a/public/img/Coors_2019_04.JPG
+++ b/public/img/Coors_2019_04.JPG
--- a/public/img/Coors_2019_08.JPG
+++ b/public/img/Coors_2019_08.JPG
--- a/public/img/Coors_2019_10.JPG
+++ b/public/img/Coors_2019_10.JPG
--- a/public/img/Coors_2020_02.JPG
+++ b/public/img/Coors_2020_02.JPG
--- a/public/img/Dastageeri 2020_09.JPG
+++ b/public/img/Dastageeri 2020_09.JPG
--- a/public/img/Dastageeri_2019_10.JPG
+++ b/public/img/Dastageeri_2019_10.JPG
--- a/public/img/Dastageeri_2020_09.JPG
+++ b/public/img/Dastageeri_2020_09.JPG
--- a/public/img/Deininger 2020_10.JPG
+++ b/public/img/Deininger 2020_10.JPG
--- a/public/img/Deininger_2020_10.JPG
+++ b/public/img/Deininger_2020_10.JPG
--- a/public/img/Ellul_2019_10.JPG
+++ b/public/img/Ellul_2019_10.JPG
--- a/public/img/Harbola 2020_09.JPG
+++ b/public/img/Harbola 2020_09.JPG
--- a/public/img/Harbola_2019_09.JPG
+++ b/public/img/Harbola_2019_09.JPG