Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b31248fba4f76f693c763f33c0a8b704aab4a92a https://github.com/phpmyadmin/phpmyadmin/commit/b31248fba4f76f693c763f33c0a8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-11-04 (Wed, 04 Nov 2015)

Changed paths: M libraries/controllers/table/TableStructureController.php

Log Message: ----------- Fix regression introduced while moving controllers

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

Commit: 7e96953e834fc0f2d91c4c02927603e360dbc140 https://github.com/phpmyadmin/phpmyadmin/commit/7e96953e834fc0f2d91c4c029276... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-11-04 (Wed, 04 Nov 2015)

Changed paths: M ChangeLog M po/cs.po M themes/pmahomme/css/codemirror.css.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2b7fd5461bea...7e96953e834f