sintonia/python_apps
martin 9c7bab616d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2011-09-09 15:07:43 -04:00
..
api_clients Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
media-monitor CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts 2011-09-08 12:36:51 -04:00
monit CC-2784: Stopping rabbitmq-server causes pypo CPU usage to increase dramatically 2011-09-08 12:17:42 -04:00
pypo Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
python-virtualenv Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
show-recorder Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
create-pypo-user.py CC-2602 : Live show record silence 2011-07-27 13:00:07 +02:00
remove-pypo-user.py -create-pypo-user scripts missing an "import sys" 2011-06-16 17:30:16 -04:00