Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 179285bb616b8eaa3dda5a625a572843aba1d9e6 https://github.com/phpmyadmin/phpmyadmin/commit/179285bb616b8eaa3dda5a625a57... Author: Smita Kumari <kumarismita62@gmail.com> Date: 2014-10-01 (Wed, 01 Oct 2014) Changed paths: M ChangeLog M js/functions.js M js/navigation.js Log Message: ----------- bug fix #4545 Signed-off-by: Smita Kumari <kumarismita62@gmail.com> Commit: fd6e7cf4e14612d88242cccb7750f1d495bcb19e https://github.com/phpmyadmin/phpmyadmin/commit/fd6e7cf4e14612d88242cccb7750... Author: Smita Kumari <kumarismita62@gmail.com> Date: 2014-10-01 (Wed, 01 Oct 2014) Changed paths: M ChangeLog M js/functions.js M js/navigation.js Log Message: ----------- resolve merge conflict Signed-off-by: Smita Kumari <kumarismita62@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45d234f6384a...fd6e7cf4e146