1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Commit graph

5 commits

Author SHA1 Message Date
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
Leonardo Quixada b41d177609 Dropped isomorphic-fetch in examples in favor of isomorphic-unfetch. (#3230) 2017-11-04 15:05:16 +01:00
Andy Kenward c29ec6bdd0 example/with-static-export update react & next dependencies (#3238)
`next@latest` instead of beta
react 16
2017-11-04 11:24:54 +01:00
Jun Matsushita b47395ab2f Fix non valid trailing comma (#2560) 2017-07-15 09:08:08 +05:30
Sergio Xalambrí 2b9944bf52 Add with-static-export example (#2234) 2017-07-01 21:44:58 +02:00