Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/utils
History
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
 		2011-04-25 17:24:53 -04:00
..
airtime-clean-storage CC-2225 airtime-clean-storage doesnt work 2011-04-25 16:48:34 -04:00
airtime-clean-storage.php Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-25 17:24:53 -04:00
airtime-import CC-2225 airtime-clean-storage doesnt work 2011-04-25 16:48:34 -04:00
airtime-import.php CC-2225 airtime-clean-storage doesnt work 2011-04-25 16:48:34 -04:00
airtime-update-db-settings CC-2138: update_db_info.py to read from /etc/airtime/airtime.conf 2011-04-04 14:04:30 -04:00
airtime-update-db-settings.py CC-2138: update_db_info.py to read from /etc/airtime/airtime.conf 2011-04-01 15:22:49 -04:00
serbianLatinToCyrillicConverter.py CC-1971 2011-02-22 18:22:31 +01:00