Skip to content

Commit

Permalink
Merge branch 'pr/517' into Development
Browse files Browse the repository at this point in the history 
Conflicts:
	src/js/foreground/view/leftPane/playlistItemView.js
  • Loading branch information
@MeoMix
MeoMix committed May 14, 2015
2 parents 878ec89 + cc6e69f commit 365051f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 365051f

Please sign in to comment.