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

..

install

SAAS-83: Add ability to install Airtime components separately

2011-11-24 18:10:06 -05:00

__init__.py

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

api_client.cfg

CC-430: Audio normalization (Replaygain Support)

2012-07-12 17:58:29 -04:00

api_client.py

Merge branch '2.1.x' into devel

2012-07-16 14:31:03 -04:00