Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3fcd07ac19b1a047d159794750d6cf0350f1f3a2 https://github.com/phpmyadmin/phpmyadmin/commit/3fcd07ac19b1a047d159794750d6... Author: Nisarg Jhaveri nisargjhaveri@gmail.com Date: 2015-05-15 (Fri, 15 May 2015)

Changed paths: M libraries/config/FormDisplay.class.php

Log Message: ----------- Fix incorrect text in Settings > Import/Export

Signed-off-by: Nisarg Jhaveri nisargjhaveri@gmail.com

Commit: 5efe4d06e3153850a415cb4430c45780daea2812 https://github.com/phpmyadmin/phpmyadmin/commit/5efe4d06e3153850a415cb4430c4... Author: Marc Delisle marc@infomarc.info Date: 2015-05-15 (Fri, 15 May 2015)

Changed paths: M libraries/config/FormDisplay.class.php

Log Message: ----------- Merge pull request #1676 from nisargjhaveri/fix_sett

Fix incorrect text in Settings > Import/Export

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f25ce24c6b5c...5efe4d06e315