Merge branch 'release-2.5.2' into develop

This commit is contained in:
Hillel Coren 2016-05-10 21:41:30 +03:00
commit 9d906299f3

View File

@ -745,4 +745,4 @@ if (Utils::isNinjaDev())
//ini_set('memory_limit','1024M'); //ini_set('memory_limit','1024M');
//Auth::loginUsingId(1); //Auth::loginUsingId(1);
} }
*/ */