Merge branch '2.5.x' into cc-5709-airtime-analyzer

Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
This commit is contained in:
Albert Santoni 2014-06-09 11:36:51 -04:00
commit 560d1a9b14
8 changed files with 28 additions and 9 deletions

View file

@ -178,7 +178,7 @@ class AirtimeInstall
echo "* Giving Apache permission to access $rp".PHP_EOL;
$success = chgrp($rp, $CC_CONFIG["webServerUser"]);
$success = chmod($rp, 02775);
$success = chmod($rp, 0775);
}
}