web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-04 06:48:49 +02:00
Code Releases Activity

Merge branch 'stable' into release/4-1

Browse Source 
Conflicts:
	CHANGELOG.md
	contrib.json
	src/js/cdn.js
This commit is contained in:
Steve Heffernan 2013-06-28 15:48:33 -07:00
commit ed8ed4dd94
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.0.3",
"version": "4.0.4",
"copyright": "Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
"keywords": [
"html5",

2
src/js/cdn.js
View File

@ -53,4 +53,4 @@
// Custom Var: vjsv is the variable name and 1.0.0 is the VJS version
+'&utme=8(vjsv)9(v0.0.0)'
;
})(new Image(),window,navigator,encodeURIComponent);
})(new Image(),window,navigator,encodeURIComponent);