Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 99e4e0d1ee9768bbe219dbae3091db52f2382f92 https://github.com/phpmyadmin/phpmyadmin/commit/99e4e0d1ee9768bbe219dbae3091... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-02-07 (Tue, 07 Feb 2017)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- Fix #12966 After adding a column ADD INDEX option won't be displayed when enabling AI

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

Commit: 8765588ef5e649e3db4959a22665f3ff34d5abb4 https://github.com/phpmyadmin/phpmyadmin/commit/8765588ef5e649e3db4959a22665... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-02-07 (Tue, 07 Feb 2017)

Changed paths: M ChangeLog M js/functions.js

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2a0d67f259dd...8765588ef5e6