Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1663995c59bb989b43f7b91736c147abd6358fa2 https://github.com/phpmyadmin/phpmyadmin/commit/1663995c59bb989b43f7b91736c1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php

Log Message: ----------- bug #4891 CSV Import ignores "Replace table data with file" checkbox

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: a0d89755448e3ff4e3a34fa0ef1405593fe7ac24 https://github.com/phpmyadmin/phpmyadmin/commit/a0d89755448e3ff4e3a34fa0ef14... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php

Log Message: ----------- Merge pull request #1663 from madhuracj/bug4891

bug #4891 CSV Import ignores "Replace table data with file" checkbox

Commit: 0e7ac33cb42f84e30e3fdd90951803f810a94434 https://github.com/phpmyadmin/phpmyadmin/commit/0e7ac33cb42f84e30e3fdd909518... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7199825abd4a...0e7ac33cb42f