Skip to content

Commit

Permalink
Merge branch 'develop' into feature/current-track-view
Browse files Browse the repository at this point in the history
  • Loading branch information
edoparearyee committed Jul 29, 2015
2 parents fa99f79 + 9983a0d commit 2482b14
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Changes in 0.8.1

* @bcmrbvm: Fix: Volume slider (#187)

## Changes in 0.8.0

* @jamesjwarren: Feature: user stats (#183)
Expand Down
1 change: 0 additions & 1 deletion app/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<a href="current">
<fm-track class="track"
ng-show="track.track.uri"
data-spotify-track="track.track"
data-user="track.user"
data-timer="trackPositionTimer"
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FM-Frontend",
"description": "The frontend for thisissoon.fm",
"version": "0.8.0",
"version": "0.8.1",
"homepage": "https://github.com/thisissoon/FM-Frontend",
"license": "MIT",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FM-Frontend",
"private": true,
"version": "0.8.0",
"version": "0.8.1",
"description": "The frontend for thisissoon.fm",
"repository": "https://github.com/thisissoon/FM-Frontend",
"license": "MIT",
Expand Down

0 comments on commit 2482b14

Please sign in to comment.