Sébastien Chopin b73675206a Merge branch 'master' into pr/44 ... # Conflicts: # lib/build/index.js		2016-12-08 21:13:20 +01:00
..
webpack	Added an nuxt.config.js option srcDir	2016-12-08 00:45:40 -06:00
index.js	Merge branch 'master' into pr/44	2016-12-08 21:13:20 +01:00