paul.baranowski b6d117d456 Fixed merge conflicts		2011-02-14 13:16:57 +01:00
..
configs	Fixed merge conflicts	2011-02-14 13:16:57 +01:00
controllers	CC-1930 Improve user interface design and wording for show/playlist workflow	2011-02-14 13:05:22 +01:00
forms	can make show as many hours long in duration as wanted.	2011-02-12 18:40:17 -05:00
layouts/scripts	-fixed UI freeze on some very special occasions	2011-02-13 13:29:16 -05:00
models	-fixed bug where a song would appear as current song and next song simultaneously.	2011-02-13 15:35:41 -05:00
validate	-added new users management screen	2011-02-09 13:03:46 -05:00
views	Fixed merge conflicts	2011-02-14 13:16:57 +01:00
Bootstrap.php	-small fixes	2011-02-10 20:48:26 -05:00