martin
|
89d2c317cb
|
CC-2044: remove hardcoded settings from application/configs/conf.php
-moved liquidsoap config to /etc/airtime as well
|
2011-03-29 20:44:04 -04:00 |
|
martin
|
8e07446e88
|
CC-2044: remove hardcoded settings from application/configs/conf.php
-baseFilesDir now moved to /etc/airtime/airtime.conf
|
2011-03-29 19:05:25 -04:00 |
|
martin
|
eb74c5718f
|
Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
python_apps/api_clients/api_client.py
|
2011-03-29 18:35:57 -04:00 |
|
martin
|
2702363a33
|
-CC-2044: remove hardcoded settings from application/configs/conf.php
-rearranged some stuff...some bugs still to go
|
2011-03-29 18:32:53 -04:00 |