Merge remote-tracking branch 'upstream/master' into ios-networking-indicator

This commit is contained in:
Florian Leitmann
2018-05-31 17:29:12 +02:00
13 changed files with 120 additions and 220 deletions
+1 -2
View File
@@ -13,7 +13,6 @@
<js-module src="www/messages.js" name="messages"/>
<js-module src="www/local-storage-store.js" name="local-storage-store"/>
<js-module src="www/cookie-handler.js" name="cookie-handler"/>
<js-module src="www/angular-integration.js" name="angular-integration"/>
<js-module src="www/helpers.js" name="helpers"/>
<js-module src="www/advanced-http.js" name="http">
<clobbers target="cordova.plugin.http"/>
@@ -82,4 +81,4 @@
<runs/>
</js-module>
</platform>
</plugin>
</plugin>