mirror of
https://github.com/apache/cordova-plugin-camera.git
synced 2025-01-31 12:42:50 +08:00
Merge branch 'master' into dev
Conflicts: plugin.xml
This commit is contained in:
commit
2a7520112e
Conflicts: plugin.xml