Merge remote-tracking branch 'up/5.3.3' into 5.3.0-conformance

# Conflicts:
#	elements/TextPath.js
#	lib/extract/extractViewBox.js
This commit is contained in:
Mikael Sand
2017-08-04 17:22:54 +03:00
19 changed files with 36 additions and 36 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Image } from 'react-native';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass.js';
import {ImageAttributes} from '../lib/attributes';
import {numberProp, touchableProps, responderProps} from '../lib/props';
import Shape from './Shape';