Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed Feb 19, 2014
2 parents 0516573 + f135b97 commit 0d58df8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ _(none)_

--------------------

## 4.4.2 (2014-02-18)
## 4.4.1 (2014-02-18)
* Added .npmignore so dist files wouldn't be ignored in packages

## 4.5.0 (2014-02-18)
## 4.4.0 (2014-02-18)
* Made the poster updateable after initialization ([view](https://github.com/videojs/video.js/pull/838))
* Exported more textTrack functions ([view](https://github.com/videojs/video.js/pull/815))
* Moved player ID generation to support video tags with no IDs ([view](https://github.com/videojs/video.js/pull/845))
Expand Down
8 changes: 4 additions & 4 deletions contrib.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
"desc": "Run tests",
"exec": "grunt test"
},
{
"desc": "Update the changelog with the new release",
"exec": "grunt chg-release:<%= type %>"
},
{
"desc": "Bump the package version",
"exec": "grunt bump-only:<%= type %>"
Expand All @@ -71,10 +75,6 @@
"desc": "Rebuild the docs",
"exec": "grunt vjsdocs"
},
{
"desc": "Update the changelog with the new release",
"exec": "grunt chg-release:<%= type %>"
},
{
"desc": "Tag the release",
"exec": "grunt tagrelease"
Expand Down

0 comments on commit 0d58df8

Please sign in to comment.