update CHANGELOG and package-lock.json

videojs · Nov 6, 2017 · 612860e · 612860e
1 parent eb65309
commit 612860e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@ CHANGELOG
 
 --------------------
 ## HEAD (Unreleased)
+_(none)_
+
+--------------------
+## 5.12.2 (2017-11-06)
+* Remove unused expected manifest js files [#1289](https://github.com/videojs/videojs-contrib-hls/pull/1289)
+* Remove extraneous methods from PlaylistLoader [#1286](https://github.com/videojs/videojs-contrib-hls/pull/1286)
+  * Move isLowestEnabledRendition to playlist module
 * update contrib-media-sources to 4.6.2 [#1291](https://github.com/videojs/videojs-contrib-hls/pull/1291)
   * update mux.js to 4.3.2
     * flush pes packets when there is enough data

diff --git a/package-lock.json b/package-lock.json