mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-11 08:33:53 +00:00
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:
commit
834aa3bcd6