Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 660123d22850ea8d9b5d6a0f67d819665ad8c439 https://github.com/phpmyadmin/phpmyadmin/commit/660123d22850ea8d9b5d6a0f67d8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-05-17 (Wed, 17 May 2017)

Changed paths: M ChangeLog M js/makegrid.js

Log Message: ----------- Fix #13177 Grid editing repeats action after error

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

Commit: ea5640fd9cd1c323dc3fa3d7db2d01ac4b239e89 https://github.com/phpmyadmin/phpmyadmin/commit/ea5640fd9cd1c323dc3fa3d7db2d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-05-17 (Wed, 17 May 2017)

Changed paths: M ChangeLog M js/makegrid.js

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/14160afba29e...ea5640fd9cd1