Tim Neutkens 163830c026 Merge branch 'canary' ... # Conflicts: # examples/with-apollo-and-redux/README.md # examples/with-sentry/README.md # examples/with-sentry/package.json # examples/with-sentry/pages/_app.js # package.json # packages/next/build/webpack-config.js # packages/next/client/index.js # server/document.js # server/render.js # test/integration/production/test/index.test.js		2019-02-11 08:22:31 +01:00
..
_app.js	Add prettier for examples directory (#5909)	2018-12-17 17:34:32 +01:00
index.js	Improve with-sentry example (#5727)	2018-12-10 23:59:12 +01:00