Commit Graph

5 Commits

Author SHA1 Message Date
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
Sébastien Chopin
c5b5913402 Update test 2017-05-21 19:18:26 +02:00
Pooya Parsa
04d3a22212 [Tests] addServerMiddleware with string path 2017-05-21 20:15:43 +04:30
Pooya Parsa
0eb3fc4a05 update tests 2017-05-15 03:31:41 +04:30
Pooya Parsa
a1b9296776 [tests] Split modules 2017-05-15 03:15:01 +04:30