Merge branch 'devel' into CC-3174
This commit is contained in:
commit
df33a457b1
31 changed files with 391 additions and 275 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue