Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bee8d2f00d54e759f584544830dba416c5db4e6d https://github.com/phpmyadmin/phpmyadmin/commit/bee8d2f00d54e759f584544830db... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-14 (Fri, 14 Jun 2013)

Changed paths: M ChangeLog M js/navigation.js

Log Message: ----------- Fix bug 3970 - Pressing enter in the filter field reloads page

Commit: eff82ef97cb80143655d52195aacc04e1327c53e https://github.com/phpmyadmin/phpmyadmin/commit/eff82ef97cb80143655d52195aac... Author: Marc Delisle marc@infomarc.info Date: 2013-06-14 (Fri, 14 Jun 2013)

Changed paths: M ChangeLog M js/navigation.js

Log Message: ----------- Fix merge conflict

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e6f6efae28c4...eff82ef97cb8