Merge branch 'develop' into release/2.6.0

ls1intum · Mar 28, 2019 · 931f0a4 · 931f0a4
2 parents eca11ef + 61cac1c
commit 931f0a4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/src/main/webapp/content/images/logo_tum_192.png b/src/main/webapp/content/images/logo_tum_192.png
diff --git a/src/main/webapp/content/images/logo_tum_256.png b/src/main/webapp/content/images/logo_tum_256.png
diff --git a/src/main/webapp/content/images/logo_tum_384.png b/src/main/webapp/content/images/logo_tum_384.png
diff --git a/src/main/webapp/content/images/logo_tum_512.png b/src/main/webapp/content/images/logo_tum_512.png
diff --git a/src/main/webapp/manifest.webapp b/src/main/webapp/manifest.webapp
@@ -3,22 +3,22 @@
   "short_name": "ArTEMiS",
   "icons": [
       {
-          "src": "./content/images/logo_tum.png",
+          "src": "./content/images/logo_tum_192.png",
           "sizes": "192x192",
           "type": "image/png"
       },
       {
-          "src": "./content/images/logo_tum.png",
+          "src": "./content/images/logo_tum_256.png",
           "sizes": "256x256",
           "type": "image/png"
       },
       {
-          "src": "./content/images/logo_tum.png",
+          "src": "./content/images/logo_tum_384.png",
           "sizes": "384x384",
           "type": "image/png"
       },
       {
-          "src": "./content/images/logo_tum.png",
+          "src": "./content/images/logo_tum_512.png",
           "sizes": "512x512",
           "type": "image/png"
       }