Commit Graph

2 Commits

Author SHA1 Message Date
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
martin 4fe3baf591 cc-2666: try separating compononents
-moved python-virtualenv install to separate install file,
 so each component can install virtualenv
2011-08-23 12:31:27 -04:00