Merge branch 'master' into old-ID

This commit is contained in:
Steve Gill
2015-04-09 14:39:48 -07:00
5 changed files with 65 additions and 52 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
<issue>https://issues.apache.org/jira/browse/CB/component/12320650</issue>
<!-- dependency id="org.apache.cordova.file@1" /-->
<dependency id="org.apache.cordova.file" version=">=1.0.1" />
<dependency id="cordova-plugin-file" version=">=1.0.1" />
<js-module src="www/FileTransferError.js" name="FileTransferError">
<clobbers target="window.FileTransferError" />