Merge branch 'saas-installer-albert' into saas-dev

This commit is contained in:
Albert Santoni 2015-06-10 15:03:11 -04:00
commit c18e728583
336 changed files with 5144 additions and 10180 deletions

View file

@ -344,7 +344,7 @@ class ApiController extends Zend_Controller_Action
* variables in the result to reflect the given timezone.
*
* @param object $result reference to the object to send back to the user
* @param string $timezone the user's timezone parameter value
* @param string $timezone the user's timezone parameter value
* @param boolean $upcase whether the timezone output should be upcased
*/
private function applyLiveTimezoneAdjustments(&$result, $timezone, $upcase)