Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 720565ef22ad0009b5f4b72fc9d2c0ed854effb4 https://github.com/phpmyadmin/phpmyadmin/commit/720565ef22ad0009b5f4b72fc9d2... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: M libraries/display_import.lib.php Log Message: ----------- Select local file import option in subsequent submissions Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: d36ac0c4116928ef5d15f3336147ce65b292fbbf https://github.com/phpmyadmin/phpmyadmin/commit/d36ac0c4116928ef5d15f3336147... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/846311e7ea8c...d36ac0c41169