Commit 2325bcde authored by Anis Kadri's avatar Anis Kadri
Browse files

Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media into dev 

Conflicts:
	src/windows8/MediaProxy.js
parents e88e3e43 5cbe86a9

src/windows8/MediaProxy.js

+1 −1
Changes for src/windows8/MediaProxy.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -180,4 +180,4 @@ module.exports = { 
    }

};



require("cordova/commandProxy").add("Media",module.exports);
 
require("cordova/windows8/commandProxy").add("Media",module.exports);