Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-02-12 15:44:50 +01:00
commit 84ef9083b4

View File

@ -51,7 +51,7 @@ class ConfigGeneratorTest extends PMATestCase
"/*\n" .
" * Generated configuration file\n" .
" * Generated by: phpMyAdmin " .
$GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n" ,
$GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n",
$result
);