Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c271dea12cdc620f9922919d50c7468502582774 https://github.com/phpmyadmin/phpmyadmin/commit/c271dea12cdc620f9922919d50c7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-08 (Wed, 08 Jul 2015)

Changed paths: M templates/designer/side_menu.phtml

Log Message: ----------- These options does not make sense in visual query builder

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

Commit: 4a1807042ef80f84e5b76c1cb4c95ee874dcfee9 https://github.com/phpmyadmin/phpmyadmin/commit/4a1807042ef80f84e5b76c1cb4c9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-08 (Wed, 08 Jul 2015)

Changed paths: M po/fr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fdef8fec9ce3...4a1807042ef8