denise 135aadf16b Merge branch '2.2.x' into devel ... Conflicts: airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/views/scripts/library/library.phtml airtime_mvc/public/js/airtime/showbuilder/builder.js airtime_mvc/public/js/airtime/showbuilder/main_builder.js		2012-11-02 12:28:21 -04:00
..
edit-file-md.phtml	CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files	2012-10-31 16:01:17 -04:00
get-file-metadata.ajax.phtml	CC-4543: Fixed colour code labels in playlist preview pop-up	2012-10-10 11:17:09 +01:00
index.phtml	-small UI change	2012-09-14 15:59:34 -04:00
library.phtml	CC-4646: Library: Make advanced search options hidden by default	2012-10-30 11:59:52 -04:00