Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1dd8d8c28c419e8faa7aba37ed3780cb0155cbd6 https://github.com/phpmyadmin/phpmyadmin/commit/1dd8d8c28c419e8faa7aba37ed37... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-19 (Thu, 19 Jun 2014)

Changed paths: M export.php M libraries/core.lib.php M libraries/display_export.lib.php M libraries/export.lib.php M test/libraries/PMA_display_export_test.php

Log Message: ----------- fix: error in export with option view output as text

Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com

Commit: ff913e2855d834e3d68ed6caaabb0fbf9e91e3e8 https://github.com/phpmyadmin/phpmyadmin/commit/ff913e2855d834e3d68ed6caaabb... Author: Isaac Bennetch bennetch@gmail.com Date: 2014-06-19 (Thu, 19 Jun 2014)

Changed paths: M export.php M libraries/core.lib.php M libraries/display_export.lib.php M libraries/export.lib.php M test/libraries/PMA_display_export_test.php

Log Message: ----------- Merge pull request #1238 from D-storm/export-back-link

fix: error in export with option view output as text

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/30de95fc0aeb...ff913e2855d8