Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml
This commit is contained in:
EddyVerbruggen 2016-01-27 23:07:58 +01:00
parent 658ee711db
commit f6479c8846

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-x-toast"
id="nl.x-services.plugins.toast"
version="2.4.0">
<name>Toast</name>