Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/models/Playlist.php python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py		2012-07-16 14:31:03 -04:00
..
add-show.js	CC-4101Calendar displays white on white for certain show names, making shows invisible	2012-07-13 10:28:50 -04:00
full-calendar-functions.js	CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.	2012-07-06 15:26:51 -04:00
schedule.js	- shortened height on Add/Remove content dialog window	2012-07-10 13:19:03 -04:00