Merge branch 'master' of github.com:stockulus/pouchdb-react-native · seigel/pouchdb-react-native@2ea91f5 · GitHub

Commit

Merge branch 'master' of github.com:stockulus/pouchdb-react-native

Browse files

# Conflicts:
#	example/package-lock.json
#	packages/pouchdb-adapter-asyncstorage/package-lock.json
#	packages/pouchdb-react-native/package-lock.json

Loading branch information

stockulus committed Aug 13, 2017

2 parents 2892d32 + 9913ab4 commit 2ea91f5