Commit 9b7c4606 authored by Andrew Grieve's avatar Andrew Grieve
Browse files

Merge branch 'master' into dev 

Conflicts:
	RELEASENOTES.md
	plugin.xml
parents a92826de 26349122

plugin.xml

+1 −0
Changes for plugin.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
xmlns:android="http://schemas.android.com/apk/res/android"

id="org.apache.cordova.media"

    version="0.2.9">



    <name>Media</name>

    <description>Cordova Media Plugin</description>

    <license>Apache 2.0</license>