Merge branch 'prepare_production' into 'master'

Prepare production See merge request !53

Merge branch 'prepare_production' into 'master'
Prepare production See merge request !53
eff4d145 · Wolfgang Knopki · f658a0f8 · 2f7d51cb · f658a0f8 · f658a0f8
Commit eff4d145 authored 4 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 0 deletions
+0 -0
--- a/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward_web.jpg
+++ b/images/SmartPollen_Projekt/PatrickHogan_PatrickWuerstle_JoeSanthanavanich_MikkoJaervilehto_CollaborationAward_web.jpg
--- a/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch.jpg
+++ b/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch.jpg
--- a/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch_web.jpg
+++ b/images/SmartPollen_Projekt/PatrickWuerstle_JoeSanthanavanich_Pitch_web.jpg
--- a/images/SmartPollen_Projekt/SmartPollenM2GIF.gif
+++ b/images/SmartPollen_Projekt/SmartPollenM2GIF.gif
--- a/images/SmartPollen_Projekt/SmartPollen_Logo.png
+++ b/images/SmartPollen_Projekt/SmartPollen_Logo.png
--- a/images/SmartPollen_Projekt/SmartPollen_Projektbeschreibung.docx
+++ b/images/SmartPollen_Projekt/SmartPollen_Projektbeschreibung.docx
--- a/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group.jpg
+++ b/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group.jpg
--- a/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group_web.jpg
+++ b/images/SmartPollen_Projekt/VolkerCoors_JoeSanthanavanich_PatrickWuerstle_Group_web.jpg
--- a/images/SmartPollen_Projekt/~$artPollen_Projektbeschreibung.docx
+++ b/images/SmartPollen_Projekt/~$artPollen_Projektbeschreibung.docx
--- a/images/demo/.DS_Store
+++ b/images/demo/.DS_Store
--- a/images/demo/130x130.gif
+++ b/images/demo/130x130.gif
--- a/images/demo/630x300.gif
+++ b/images/demo/630x300.gif
--- a/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg
+++ b/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg
--- a/images/demo/bbf_logo.png
+++ b/images/demo/bbf_logo.png
--- a/images/demo/f_logo.png
+++ b/images/demo/f_logo.png
--- a/images/demo/hft_logo.jpg
+++ b/images/demo/hft_logo.jpg
--- a/images/demo/i_logo.png
+++ b/images/demo/i_logo.png
--- a/images/demo/ihs_logo.jpg
+++ b/images/demo/ihs_logo.jpg
--- a/images/demo/m4lab_logo.jpg
+++ b/images/demo/m4lab_logo.jpg
--- a/images/demo/map_logo.png
+++ b/images/demo/map_logo.png