Merge remote-tracking branch 'origin/master' into spotifyplaylists

Browse Source

Conflicts:
	admin/mac/macdeploy.py

...

This commit is contained in:

Leo Franchi

2012-03-26 12:26:09 -04:00

parent 1bd7d37a0a f41872540d

commit cb484a2058

14 changed files with 214 additions and 253 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/images/recently-played.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 8.6 KiB