Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
This commit is contained in:
James 2012-09-10 18:04:35 -04:00
commit 645593f954
16 changed files with 1762 additions and 766 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/StoredFile.php
View file

@ -51,11 +51,6 @@ class Application_Model_StoredFile
"owner_id" => "DbOwnerId"
);
public function __construct()
{
}
public function getId()
{
return $this->_file->getDbId();