Merge remote-tracking branch 'origin/master' into 2.4

# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js

1 files changed, 48 insertions, 0 deletions

diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644
index 00000000..72638eef
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,48 @@
+{
+  "short_name": "wallabag",
+  "name": "Save and classify articles. Read them later. Freely.",
+  "icons": [
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-57.png",
+      "type": "image/png",
+      "sizes": "57x57"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-72.png",
+      "type": "image/png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-76.png",
+      "type": "image/png",
+      "sizes": "76x76"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-114.png",
+      "type": "image/png",
+      "sizes": "114x114"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-120.png",
+      "type": "image/png",
+      "sizes": "120x120"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-144.png",
+      "type": "image/png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-152.png",
+      "type": "image/png",
+      "sizes": "152x152"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "display": "standalone",
+  "background_color": "#FFFFFF"
+}