Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Raoult committed Feb 12, 2015
2 parents ae3f18e + 2916011 commit 43ee2c9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mixtube-playback",
"version": "1.0.0-alpha.3",
"version": "1.0.0-alpha.4",
"main": "./src/main/playback",
"dependencies": {
"lodash": "^3.0.1",
Expand Down

0 comments on commit 43ee2c9

Please sign in to comment.