zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2025-12-22 15:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	lib/extract/extractViewBox.js
#	package.json
This commit is contained in:
Mikael Sand
2017-07-15 14:02:40 +03:00
parent c7039588f6 5d6db26afe
commit 7547effd1f
29 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/props.js
View File

@@ -1,4 +1,4 @@
import {PropTypes} from 'react';
import PropTypes from 'prop-types';
import {PanResponder} from 'react-native';
const numberProp = PropTypes.oneOfType([PropTypes.string, PropTypes.number]);