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 4 years ago by Patrick
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 0 deletions
+0 -0
--- a/public/img/Harbola_2019_10.JPG
+++ b/public/img/Harbola_2019_10.JPG
--- a/public/img/Harbola_2020_09.JPG
+++ b/public/img/Harbola_2020_09.JPG
--- a/public/img/Kesnar_2019.JPG
+++ b/public/img/Kesnar_2019.JPG
--- a/public/img/Koukofikis_2020_09.JPG
+++ b/public/img/Koukofikis_2020_09.JPG
--- a/public/img/Mutani_2018_10.JPG
+++ b/public/img/Mutani_2018_10.JPG
--- a/public/img/Padsala 2020_07.JPG
+++ b/public/img/Padsala 2020_07.JPG
--- a/public/img/Padsala 2020_09.JPG
+++ b/public/img/Padsala 2020_09.JPG
--- a/public/img/Padsala_2020_07.JPG
+++ b/public/img/Padsala_2020_07.JPG
--- a/public/img/Padsala_2020_09.JPG
+++ b/public/img/Padsala_2020_09.JPG
--- a/public/img/Piepereit_2019_09.JPG
+++ b/public/img/Piepereit_2019_09.JPG
--- a/public/img/Rawiel_2019_04.JPG
+++ b/public/img/Rawiel_2019_04.JPG
--- a/public/img/Santhanavanich 2020_09.JPG
+++ b/public/img/Santhanavanich 2020_09.JPG
--- a/public/img/Santhanavanich_2020_09.JPG
+++ b/public/img/Santhanavanich_2020_09.JPG
--- a/public/img/Santhanavanich_2020_12.JPG
+++ b/public/img/Santhanavanich_2020_12.JPG
--- a/public/img/Schneider 2020_09.JPG
+++ b/public/img/Schneider 2020_09.JPG
--- a/public/img/Schneider_2018_02.JPG
+++ b/public/img/Schneider_2018_02.JPG
--- a/public/img/Schneider_2020_09.JPG
+++ b/public/img/Schneider_2020_09.JPG
--- a/public/img/Sini 2020_09.JPG
+++ b/public/img/Sini 2020_09.JPG
--- a/public/img/Sini_2020_09.JPG
+++ b/public/img/Sini_2020_09.JPG
--- a/public/img/V_Coors_2019_03.JPG
+++ b/public/img/V_Coors_2019_03.JPG