Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
johniak committed Jan 17, 2019
2 parents ad206a8 + 45ff498 commit 7c6b7da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"react-art": "^16.6.3",
"react-dev-utils": "^6.1.1",
"react-dom": "^16.6.3",
"react-native-web": "^0.9.8",
"react-native-web": "0.9.9",
"shallowequal": "1.1.0",
"uuid": "3.3.2"
},
Expand Down

0 comments on commit 7c6b7da

Please sign in to comment.