Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 013a9bc24a44e26f158a9ab7f21eaf25f907e04d https://github.com/phpmyadmin/phpmyadmin/commit/013a9bc24a44e26f158a9ab7f21e... Author: Marc Delisle marc@infomarc.info Date: 2017-05-23 (Tue, 23 May 2017)

Changed paths: M doc/setup.rst

Log Message: ----------- Fix typo, improve wording

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

Commit: f2edeff02a54b2c8a443d3b9e3fefc2458e52968 https://github.com/phpmyadmin/phpmyadmin/commit/f2edeff02a54b2c8a443d3b9e3fe... Author: Michal Čihař michal@cihar.com Date: 2017-05-23 (Tue, 23 May 2017)

Changed paths: M doc/setup.rst

Log Message: ----------- Merge branch 'QA_4_7'

Commit: 52ff75837560497cb291d9f5e0ca4ba8423fbbf2 https://github.com/phpmyadmin/phpmyadmin/commit/52ff75837560497cb291d9f5e0ca... Author: Michal Čihař michal@cihar.com Date: 2017-05-23 (Tue, 23 May 2017)

Changed paths: M gis_data_editor.php M js/db_structure.js M js/functions.js M libraries/ErrorHandler.php M libraries/Util.php M libraries/central_columns.lib.php M libraries/config/FormDisplay.tpl.php M libraries/display_change_password.lib.php M libraries/display_import.lib.php M libraries/navigation/NavigationTree.php M libraries/replication_gui.lib.php M libraries/rte/rte_footer.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/server_privileges.lib.php M libraries/server_status_advisor.lib.php M libraries/server_status_monitor.lib.php M libraries/server_status_variables.lib.php M libraries/sql.lib.php M prefs_manage.php M setup/frames/index.inc.php M templates/database/designer/aggregate_query_panel.twig M templates/database/designer/delete_relation_panel.twig M templates/database/designer/having_query_panel.twig M templates/database/designer/new_relation_panel.twig M templates/database/designer/options_panel.twig M templates/database/designer/query_details.phtml M templates/database/designer/rename_to_panel.twig M templates/database/designer/table_list.phtml M templates/database/designer/where_query_panel.twig M templates/prefs_autoload.twig M templates/server/databases/table_row.phtml M templates/table/chart/tbl_chart.phtml M templates/table/gis_visualization/gis_visualization.phtml M templates/table/search/options.phtml M templates/table/search/zoom_result_form.phtml M templates/table/structure/move_columns_dialog.phtml M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_variables_test.php M test/libraries/common/PMA_browseUploadFile_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2acd211373eb...52ff75837560