Sebastian McKenzie
|
a4a347b4f0
|
Merge branch 'master' into development
Conflicts:
packages/babel/src/generation/generators/flow.js
packages/babel/src/generation/generators/types.js
packages/babel/src/transformation/transformers/es6/for-of.js
packages/babel/src/traversal/path/inference/inferers.js
packages/babel/src/types/index.js
packages/babel/src/util.js
packages/babel/test/util.js
|
2015-08-15 19:50:34 -04:00 |
|