Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)

Conflicts: framework/src/org/apache/cordova/CordovaWebView.java
2026-04-23 00:00:09 +08:00 · 2014-11-06 15:37:30 -05:00
parent cc7d352209 e78db000c6
commit fdef0db87c
3 changed files with 14 additions and 5 deletions
@@ -5,7 +5,7 @@ local.properties
 /gradlew.bat
 /gradle
 # Ant builds
-ant-built
+ant-build
 ant-gen
 # Eclipse builds
 gen