Merge branch 'master' into develop

express-vue · Aug 7, 2017 · 694eedf · 694eedf
2 parents 821ea1f + 6da58f0
commit 694eedf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -235,9 +235,11 @@ const vueOptions = {
                 // Styles
                 { style: '/assets/rendered/style.css' }
                 { style: '/assets/rendered/style.css', type: 'text/css' }
-                { style: '/assets/rendered/style.css', type: 'text/css', rel: 'stylesheet' }
-                // Note with Styles, [type] and [rel] are optional...
+                // Note with Styles, [type] is optional...
                 // ...
+                // Rel
+                { rel: 'icon', type: 'image/png', href: '/assets/favicons/favicon-32x32.png', sizes: '32x32' }
+                // Generic rel for things like icons and stuff
             ],
         }
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "express-vue",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "Vue rendering engine for Express.js",
     "homepage": "https://github.com/express-vue/express-vue",
     "author": {