Merge branch 'master' of https://github.com/videojs/video.js into stable

* 'master' of https://github.com/videojs/video.js: @thijstriemstra added a Dutch translation. closes videojs#1566 @OlehTsvirko added a Russian translation. closes videojs#1563 @OlehTsvirko added a Ukrainian translation. closes videojs#1562 @andekande improved the German translation. closes videojs#1555 @aptx4869 fixed an issue where the native JSON parser wasn't used. closes videojs#1565 Removed dist files
jgubman · Oct 6, 2014 · 4406334 · 4406334
2 parents 085692f + 375cc1e
commit 4406334
Show file tree

Hide file tree

Showing 25 changed files with 90 additions and 10,903 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* @aptx4869 fixed an issue where the native JSON parser wasn&#x27;t used ([view](https://github.com/videojs/video.js/pull/1565))
+* @andekande improved the German translation ([view](https://github.com/videojs/video.js/pull/1555))
+* @OlehTsvirko added a Ukrainian translation ([view](https://github.com/videojs/video.js/pull/1562))
+* @OlehTsvirko added a Russian translation ([view](https://github.com/videojs/video.js/pull/1563))
+* @thijstriemstra added a Dutch translation ([view](https://github.com/videojs/video.js/pull/1566))
 
 --------------------
 

diff --git a/dist/video-js/demo.captions.vtt b/dist/video-js/demo.captions.vtt
diff --git a/dist/video-js/demo.html b/dist/video-js/demo.html
diff --git a/dist/video-js/font/vjs.eot b/dist/video-js/font/vjs.eot
diff --git a/dist/video-js/font/vjs.svg b/dist/video-js/font/vjs.svg
diff --git a/dist/video-js/font/vjs.ttf b/dist/video-js/font/vjs.ttf
diff --git a/dist/video-js/font/vjs.woff b/dist/video-js/font/vjs.woff
diff --git a/dist/video-js/lang/de.js b/dist/video-js/lang/de.js
diff --git a/dist/video-js/lang/es.js b/dist/video-js/lang/es.js
diff --git a/dist/video-js/lang/fr.js b/dist/video-js/lang/fr.js
diff --git a/dist/video-js/lang/it.js b/dist/video-js/lang/it.js