Merge branch 'CC-3174' into devel
Conflicts: airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
commit
157078b963
12 changed files with 150 additions and 30 deletions
|
@ -1,9 +1,7 @@
|
|||
#side_playlist {
|
||||
width: 40%;
|
||||
min-height: 475px;
|
||||
padding: 8px;
|
||||
padding-bottom: 0px;
|
||||
font-size: 16px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
#side_playlist,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue