Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8cb3b720ba2f58e1410faaf3a23d6490db0a9d7e https://github.com/phpmyadmin/phpmyadmin/commit/8cb3b720ba2f58e1410faaf3a23d... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2014-12-12 (Fri, 12 Dec 2014) Changed paths: M ChangeLog M themes/pmahomme/css/common.css.php Log Message: ----------- Fix #4637 Field Alignment Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 5a3449b6942146b523f08c0a95277f601f63fe9d https://github.com/phpmyadmin/phpmyadmin/commit/5a3449b6942146b523f08c0a9527... Author: Marc Delisle <marc@infomarc.info> Date: 2014-12-12 (Fri, 12 Dec 2014) Changed paths: M ChangeLog M themes/pmahomme/css/common.css.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85678bf19959...5a3449b69421