Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml
This commit is contained in:
EddyVerbruggen 2016-01-15 15:51:18 +01:00
parent 577b1704d9
commit c7a329a7ac

View File

@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="nl.x-services.plugins.toast"
version="2.3.1">
version="2.3.2">
<name>Toast</name>