Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8833d806971ab0edbb6dcff5bafd8277a78f1d40 https://github.com/phpmyadmin/phpmyadmin/commit/8833d806971ab0edbb6dcff5bafd... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-10-30 (Fri, 30 Oct 2015)

Changed paths: M libraries/controllers/DatabaseStructureController.php

Log Message: ----------- Remove dead code. Already handled in addRemoveFavoriteTablesAction()

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

Commit: f99c8c29053fe30063d88d3f1553c3d1ed744236 https://github.com/phpmyadmin/phpmyadmin/commit/f99c8c29053fe30063d88d3f1553... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-10-30 (Fri, 30 Oct 2015)

Changed paths: M po/zh_CN.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0b714a23434b...f99c8c29053f