Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 809138c4f1eb2d002f671d0ccbf52d88d436ed21 https://github.com/phpmyadmin/phpmyadmin/commit/809138c4f1eb2d002f671d0ccbf5... Author: Marc Delisle marc@infomarc.info Date: 2013-09-26 (Thu, 26 Sep 2013)

Changed paths: M ChangeLog M libraries/navigation/Nodes/Node_Database.class.php

Log Message: ----------- bug #3996 Drizzle navigation doesn't expand

Commit: 399f6af722a64ee6250b522488287045dac28d05 https://github.com/phpmyadmin/phpmyadmin/commit/399f6af722a64ee6250b52248828... Author: Marc Delisle marc@infomarc.info Date: 2013-09-26 (Thu, 26 Sep 2013)

Changed paths: M ChangeLog M libraries/navigation/Nodes/Node_Database.class.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e44c814ef755...399f6af722a6