sintonia/python_apps/pypo
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
..
install Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
liquidsoap_bin CC-2689: Build latest liquidsoap version 2011-08-17 18:34:45 -04:00
liquidsoap_scripts Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
test CC-2760: Remove shebangs from files that don't need them, fix chmod of files 2011-09-06 19:06:13 -04:00
util CC-2760: Remove shebangs from files that don't need them, fix chmod of files 2011-09-06 19:06:13 -04:00
AUTHORS CC-2016: Rearrange python scripts for reusability 2011-03-24 00:00:46 -04:00
LICENSE CC-2016: Rearrange python scripts for reusability 2011-03-24 00:00:46 -04:00
airtime-liquidsoap CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts 2011-09-08 12:36:51 -04:00
airtime-playout CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts 2011-09-08 12:36:51 -04:00
airtime-playout-init-d CC-2726: monit monitor and unmonitor order change 2011-08-26 15:44:19 -04:00
logging.cfg - removed cue_file because it's handled by liquidsoap itself. 2011-07-19 16:31:02 -04:00
pypo-cli.py Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
pypo-notify.py CC-2760: Remove shebangs from files that don't need them, fix chmod of files 2011-09-06 19:06:13 -04:00
pypo.cfg CC-2566: Separate URL config out of config files and put them with API_CLIENT 2011-07-19 19:42:23 -04:00
pypofetch.py Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00
pypopush.py Merge branch '1.9.1' into devel 2011-09-09 15:07:43 -04:00