Albert Santoni 01ea6f27ae Merge branch 'saas-dev' into saas-installer-albert ... Conflicts: python_apps/api_clients/api_clients/api_client.py		2015-06-02 15:40:57 -04:00
..
bin	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 18:26:16 -04:00
install	Three bugfixes	2015-05-22 18:20:45 -04:00
liquidsoap	Merge branch 'saas-dev' into saas-installer-albert	2015-05-22 19:09:30 -04:00
pypo	Merge branch 'saas-dev' into saas-installer-albert	2015-06-02 15:40:57 -04:00
tests	CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime	2015-01-27 18:43:36 -05:00
setup.py	Added missing requests dependency to pypo's requirements	2015-05-22 18:43:05 -04:00