Merge branch 'master' into 0.9.10

lib/app/router.js

@@ -54,7 +54,7 @@ const scrollBehavior = (to, from, savedPosition) => {
 <% } %>
 
 export default new Router({
-  mode: 'history',
+  mode: '<%= router.mode %>',
   base: '<%= router.base %>',
   linkActiveClass: '<%= router.linkActiveClass %>',
   scrollBehavior,

lib/build.js

@@ -181,6 +181,7 @@ function * generateRoutesAndFiles () {
     uniqBy: _.uniqBy,
     isDev: this.dev,
     router: {
+      mode: this.options.router.mode,
       base: this.options.router.base,
       middleware: this.options.router.middleware,
       linkActiveClass: this.options.router.linkActiveClass,

lib/nuxt.js

@@ -36,6 +36,7 @@ class Nuxt {
         mode: 'out-in'
       },
       router: {
+        mode: 'history',
         base: '/',
         middleware: [],
         linkActiveClass: 'nuxt-link-active',