sintonia/python_apps
Martin Konecny f96b990275 Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
2012-04-12 19:10:17 -04:00
..
api_clients Merge branch '2.0.x' into devel 2012-04-12 19:10:17 -04:00
icecast2 CC-2886: changing file name 2011-09-29 15:45:04 -04:00
media-monitor Merge branch '2.0.x' into devel 2012-04-12 19:10:17 -04:00
monit CC-3520: Change default password of monit 2012-04-01 00:20:47 -04:00
pypo Merge branch '2.0.x' into devel 2012-04-12 19:10:17 -04:00
python-virtualenv CC-3041: Module virtualenv was already imported 2011-11-25 18:02:56 -05:00
create-pypo-user.py CC-3572: pypo user should have shell set to /bin/false 2012-03-31 22:11:12 -04:00
remove-pypo-user.py -create-pypo-user scripts missing an "import sys" 2011-06-16 17:30:16 -04:00