From b6c5428da5ea8870931d9eaa5c629721e96ffa70 Mon Sep 17 00:00:00 2001
From: "johan.roxendal@gu.se" <johan.roxendal@gu.se>
Date: Sun, 7 May 2017 21:46:57 +0200
Subject: [PATCH 1/3] scss should be handled by sass-loader

---
 lib/webpack/vue-loader.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/webpack/vue-loader.config.js b/lib/webpack/vue-loader.config.js
index 094ce139c8..81eb2b9ba9 100644
--- a/lib/webpack/vue-loader.config.js
+++ b/lib/webpack/vue-loader.config.js
@@ -18,7 +18,7 @@ export default function ({ isClient }) {
       'css': styleLoader.call(this, 'css'),
       'less': styleLoader.call(this, 'less', 'less-loader'),
       'sass': styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax'),
-      'scss': styleLoader.call(this, 'sass', 'scss-loader'),
+      'scss': styleLoader.call(this, 'sass', 'sass-loader'),
       'stylus': styleLoader.call(this, 'stylus', 'stylus-loader'),
       'styl': styleLoader.call(this, 'stylus', 'stylus-loader')
     },

From 0fe5b2c17fe78be8302bbb6bbb3ff90472c9a795 Mon Sep 17 00:00:00 2001
From: Johan Roxendal <johan@roxendal.com>
Date: Mon, 8 May 2017 09:22:35 +0200
Subject: [PATCH 2/3] Fixed refractoring error in generate

---
 lib/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generate.js b/lib/generate.js
index d1efb299aa..70769a65b0 100644
--- a/lib/generate.js
+++ b/lib/generate.js
@@ -143,7 +143,7 @@ export default function () {
           return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)
         }
       })
-      console.error('==== Error report ==== \n' + report).join('\n\n') // eslint-disable-line no-console
+      console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
     }
     return this
   })

From 92bbacbbdfa82fb3fc57a3861a145b1c6061d93f Mon Sep 17 00:00:00 2001
From: Alexandre Chopin <wikeo65@gmail.com>
Date: Tue, 9 May 2017 10:48:26 +0200
Subject: [PATCH 3/3] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1966077196..45918d0147 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
   <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/v/nuxt.svg" alt="Version"></a>
   <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/l/nuxt.svg" alt="License"></a>
   <a href="https://gitter.im/nuxt/nuxt.js"><img src="https://img.shields.io/badge/GITTER-join%20chat-green.svg" alt="Gitter"></a>
-  <a href="https://donorbox.org/nuxt"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>
+  <a href="https://opencollective.com/nuxtjs"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>
   
 </p>
 
@@ -173,4 +173,4 @@ https://github.com/nuxt/nuxt.js/projects/1
 
 Feel free to make a donation to support us.
 
-<a href="https://donorbox.org/nuxt"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>
+<a href="https://opencollective.com/nuxtjs"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>