Merge branch 'devel' into CC-3174

This commit is contained in:
Naomi Aro 2012-01-16 09:58:02 +01:00
commit df33a457b1
31 changed files with 391 additions and 275 deletions

View file

@ -231,7 +231,6 @@ class LibraryController extends Zend_Controller_Action
public function contentsAction()
{
$post = $this->getRequest()->getPost();
Logging::log(print_r($post, true));
$datatables = Application_Model_StoredFile::searchFilesForPlaylistBuilder($post);
//format clip lengh to 1 decimal