James 332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/public/js/airtime/schedule/add-show.js		2012-04-05 16:03:15 -04:00
..
add-show.js	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-04-05 16:03:15 -04:00
full-calendar-functions.js	CC-3174 : showbuilder	2012-02-08 12:53:46 +01:00
schedule.js	CC-3581: Calendar->It should not be possible to change the duration for	2012-04-04 15:44:52 -04:00