Tim Neutkens 18f8ab392a Merge branch 'master' into canary ... # Conflicts: # examples/with-apollo/lib/initApollo.js # examples/with-apollo/package.json # examples/with-react-with-styles/package.json # examples/with-static-export/package.json # package.json		2017-11-05 11:01:59 +01:00
..
build	Merge branch 'master' into canary	2017-11-05 11:01:59 +01:00
config.js	Add next configuration as an option for custom servers (#2058)	2017-05-31 13:36:07 +05:30
document.js	Support de-deduping head tags by setting key (#3170)	2017-10-31 22:52:51 +01:00
export.js	Allow use of filenames in exportPathMap (#2973)	2017-10-05 20:33:10 +02:00
hot-reloader.js	[WIP] Use buildId in chunk urls as well (#2873)	2017-08-31 05:47:06 +05:30
index.js	Combine source maps (#3178)	2017-10-30 15:57:35 +01:00
next.js	Programmatic API (#310)	2016-12-16 12:33:08 -08:00
on-demand-entry-handler.js	Keep some buffered pages, that won't be disposed. Fix #1939 (#2592)	2017-09-28 14:51:03 +02:00
render.js	Combine source maps (#3178)	2017-10-30 15:57:35 +01:00
require.js	write assets to disk	2016-10-16 04:49:42 +09:00
resolve.js	New test setup (#640)	2017-01-12 13:14:49 +09:00
router.js	Allow parsed url to be passed down (#950)	2017-02-02 12:21:08 +05:30
utils.js	Load chunks in SSR mode only if they exists in the filesystem (#2196)	2017-06-08 19:41:22 +02:00