Merge branch 'fix-middleware' of github.com:Atinux/nuxt.js into fix-middleware

Conflicts:
	lib/app/client.js
	lib/app/server.js
This commit is contained in:
Sébastien Chopin 2017-05-08 19:33:55 +02:00
commit 834aa3bcd6

Diff Content Not Available