Commit Graph

4 Commits

Author SHA1 Message Date
naomiaro d9e8e1641a Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
2011-01-06 01:05:34 -05:00
mkonecny 20c392343b -changed some references from campcaster to airtime in the documentation / comments 2011-01-05 12:19:58 -05:00
naomiaro 101b6fafa6 searching includes groups for and/or 2011-01-04 19:18:44 -05:00
naomiaro 5795871bcc layout has more widget-like setup now. side playlist reused in search. 2010-12-21 23:33:58 -05:00