Merge remote-tracking branch 'upstream/master' into 5.3.0-conformance

# Conflicts:
#	lib/extract/extractViewBox.js
#	package.json
This commit is contained in:
Mikael Sand
2017-07-15 14:02:40 +03:00
29 changed files with 72 additions and 52 deletions

View File

@@ -1,5 +1,5 @@
import React from 'react';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass';
import Shape from './Shape';
import {pathProps, fontProps} from '../lib/props';
import {GroupAttributes} from '../lib/attributes';