Commit Graph

9 Commits

Author SHA1 Message Date
Sébastien Chopin
e5052c3a87 Update test 2017-05-21 21:00:01 +02:00
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
08fd004044 [tests] requireModule 2017-05-21 20:11:16 +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
Pooya Parsa
5001341ea7 code style 2017-05-15 03:10:29 +04:30
Pooya Parsa
58842f3c03 [tests] use promise 2017-05-15 03:10:09 +04:30
Pooya Parsa
632a94a9c6 [module] Tests 2017-05-15 03:03:31 +04:30