Marc Delisle 5d9a7a748c Fix merge conflicts ...

Signed-off-by: Marc Delisle <marc@infomarc.info>

2015-05-07 10:18:08 -04:00

..

PMA_EVN_getDataFromRequest_test.php

Fix method names in tests

2015-04-28 15:42:32 +05:30

PMA_EVN_getEditorForm_test.php

Merge branch 'QA_4_4'

2015-05-06 15:16:18 -04:00

PMA_EVN_getQueryFromRequest_test.php

PHPCS updates.

2014-03-14 23:06:46 +01:00

PMA_RTN_getDataFromRequest_test.php

Remove unused locale variables.

2014-11-10 23:26:57 +01:00

PMA_RTN_getEditorForm_test.php

Fix merge conflicts

2015-05-07 08:47:46 -04:00

PMA_RTN_getExecuteForm_test.php

Fix merge conflicts

2015-05-07 10:18:08 -04:00

PMA_RTN_getQueryFromRequest_test.php

Wrap some long lines - PMA_RTN_getQueryFromRequest_test.php

2015-04-28 17:44:54 +05:30

PMA_RTN_ParameterParser_test.php

Fix method names in tests

2015-04-28 15:42:32 +05:30

PMA_TRI_getDataFromRequest_test.php

Fix method names in tests

2015-04-28 15:42:32 +05:30

PMA_TRI_getEditorForm_test.php

phpunit 4.2: assertTag is deprecated

2015-05-07 10:16:20 -04:00

PMA_TRI_getQueryFromRequest_test.php

PHPCS updates.

2014-03-14 20:58:33 +01:00