Merge branch 'CC-3174' into devel

Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Naomi Aro 2012-03-06 13:51:37 +01:00
commit 157078b963
12 changed files with 150 additions and 30 deletions

View file

@ -1,9 +1,7 @@
#side_playlist {
width: 40%;
min-height: 475px;
padding: 8px;
padding-bottom: 0px;
font-size: 16px;
overflow: auto;
}
#side_playlist,