Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e0aa1a4c9226b4c54eba503f2de4a2f0abbc1a54 https://github.com/phpmyadmin/phpmyadmin/commit/e0aa1a4c9226b4c54eba503f2de4... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-22 (Mon, 22 Jun 2015)

Changed paths: M doc/config.rst M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/sql.lib.php

Log Message: ----------- #4963 Improve/restore non-unique index row editing

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

Commit: 7edd9524c0d3c3c6ff83001e86c987002080c15e https://github.com/phpmyadmin/phpmyadmin/commit/7edd9524c0d3c3c6ff83001e86c9... Author: Marc Delisle marc@infomarc.info Date: 2015-06-22 (Mon, 22 Jun 2015)

Changed paths: M doc/config.rst M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/sql.lib.php

Log Message: ----------- Merge pull request #1751 from madhuracj/bug4963

#4963 Improve/restore non-unique index row editing

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7d8faa6818d6...7edd9524c0d3