Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/Preference.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js		2011-06-21 11:20:35 +02:00
..
api_clients	Merge branch 'cc-2015-on-reboot-resume-show' into devel	2011-06-17 15:10:33 -04:00
media-monitor	Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel	2011-06-21 11:20:35 +02:00
monit	cc-2055: switch to init.d	2011-06-16 20:01:37 -04:00
pypo	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2011-06-20 17:38:27 -04:00
show-recorder	CC-2410: Clean up install process	2011-06-20 17:38:18 -04:00
create-pypo-user.py	-create-pypo-user scripts missing an "import sys"	2011-06-16 17:30:16 -04:00
remove-pypo-user.py	-create-pypo-user scripts missing an "import sys"	2011-06-16 17:30:16 -04:00