Sébastien Chopin 0183ac4b86 Merge branch 'dev' of github.com:Atinux/nuxt.js into dev ... Conflicts: lib/build.js lib/module.js lib/server.js		2017-05-21 19:23:31 +02:00
..
basic	Store state should always be a method now	2017-05-21 15:45:21 +02:00
children/pages	Move to fixtures and add generate test	2016-12-20 20:44:42 +01:00
dynamic-routes/pages	add tests for dynamic routes	2017-02-10 21:24:29 +01:00
empty/pages	Move to fixtures and add generate test	2016-12-20 20:44:42 +01:00
error/pages	Move to fixtures and add generate test	2016-12-20 20:44:42 +01:00
module	Merge branch 'dev' of github.com:Atinux/nuxt.js into dev	2017-05-21 19:23:31 +02:00
with-config	Update test	2017-05-21 19:18:26 +02:00