Merge branch 'master' into dev
Conflicts:
RELEASENOTES.md
plugin.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/3a721b46
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/3a721b46
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/3a721b46
Branch: refs/heads/master
Commit: 3a721b46a349adbe68245b779ae75730f7cbe264
Parents: e7ddbde 6a3bc14
Author: Andrew Grieve <[email protected]>
Authored: Thu Feb 27 15:59:30 2014 -0500
Committer: Andrew Grieve <[email protected]>
Committed: Thu Feb 27 15:59:30 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
