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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
This commit is contained in:
Martin Konecny 2011-11-14 21:19:56 -05:00
commit c19b7f7c6e
8 changed files with 66 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/models/MusicDir.php
View file

@ -281,7 +281,6 @@ class Application_Model_MusicDir {
}
public static function removeWatchedDir($p_dir){
$real_path = realpath($p_dir)."/";
if($real_path != "/"){
$p_dir = $real_path;