Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ba673e3046cb32d80971d709a95fe36872c7e121 https://github.com/phpmyadmin/phpmyadmin/commit/ba673e3046cb32d80971d709a95f... Author: Aswani Prakash aswani15prakash@gmail.com Date: 2018-10-29 (Mon, 10 October 2018) -03:00

Changed paths: M export.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/ExportForm.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/config.default.php

Log Message: ----------- Issue #13057 fix: Option to exclude user definition from views on export

Signed-off-by: Aswani Prakash aswani15prakash@gmail.com

Commit: ae94d312515f87f208fcbd1125d86255d71df361 https://github.com/phpmyadmin/phpmyadmin/commit/ae94d312515f87f208fcbd1125d8... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-10-29 (Mon, 10 October 2018) -03:00

Changed paths: M ChangeLog M libraries/classes/Plugins/Export/ExportSql.php M test/classes/Plugins/Export/ExportSqlTest.php

Log Message: ----------- Add ChangeLog entry for #13057

- Fix tests

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: 3209bd34c093604170b45ef097c1d5aaacf6c95e https://github.com/phpmyadmin/phpmyadmin/commit/3209bd34c093604170b45ef097c1... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-10-29 (Mon, 10 October 2018) -03:00

Changed paths: M ChangeLog M export.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/ExportForm.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/config.default.php M test/classes/Plugins/Export/ExportSqlTest.php

Log Message: ----------- Merge branch 'aswaniprakash-PMA_13057'