Merge branch '2.x' of github.com:nuxt/nuxt.js into 2.x

Browse Source

Conflicts:
	packages/nuxt-legacy/package.json
	packages/nuxt-start/package.json

...

This commit is contained in:

Sébastien Chopin 2018-10-13 21:10:51 +02:00

parent 95428c2466 d79f9a7c67

commit d897890c9e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available