Dan Abramov 779d5bd040 Fix merge conflict

2017-03-23 19:55:23 +00:00

..

__mocks__

Run prettier

2017-03-13 17:05:18 -07:00

fb

Merge branch 'master' into rollup

2017-03-15 20:09:13 +00:00

isomorphic

Delete addons (#9209)

2017-03-20 16:15:01 +00:00

node_modules

providesModule -> explicit requires for cross-package dependencies (#9078)

2017-02-28 18:42:52 -08:00

renderers

Fix merge conflict

2017-03-23 19:55:23 +00:00

shared

Delete addons (#9209)

2017-03-20 16:15:01 +00:00

test

Run prettier

2017-03-13 17:05:18 -07:00

umd

Delete addons (#9209)

2017-03-20 16:15:01 +00:00

package.json

Bump version for v16 development

2016-04-07 11:27:28 -07:00

ReactVersion.js

Bumped React version to 16.0.0-alpha.5

2017-03-21 13:04:08 -07:00