Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 9306a93bec4179230d989e3331402b9b6526272f
https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f
https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M ChangeLog
M libraries/config/messages.inc.php
M libraries/plugins/import/AbstractImportCsv.class.php
Log Message:
-----------
Merge branch 'QA_4_4' of
https://github.com/phpmyadmin/phpmyadmin into QA_4_4
Commit: a5398611f706067cca986e545af4256ca15df898
https://github.com/phpmyadmin/phpmyadmin/commit/a5398611f706067cca986e545af…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/0e7ac33cb42f...a5398611f706