sintonia/python_apps/api_clients
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05: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-2977: Never delete files from the database 2012-01-11 12:17:48 -05:00
api_client.py Merge branch '2.0.x' into devel 2012-02-14 14:47:07 -05:00