Commit Graph

2 Commits

Author SHA1 Message Date
naomiaro 1e2cef160a Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	htmlUI/templates/header.tpl
2010-10-01 17:33:13 -04:00
naomiaro eb1678f961 moving ui_browser.php & ui_handler.php to htmlUi 2010-10-01 17:29:25 -04:00