[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5a4d8a: Fix #4648 Missing borders

[Marc Delisle]

  Branch: refs/heads/QA_4_3
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5a4d8aa8cd63b90b8037e7fa16931a46fc33a72e
      https://github.com/phpmyadmin/phpmyadmin/commit/5a4d8aa8cd63b90b8037e7fa16931a46fc33a72e
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-12-14 (Sun, 14 Dec 2014)

  Changed paths:
    M ChangeLog
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Fix #4648 Missing borders

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: cbc0b61addc2859dfa56e87d5c16a2e57e116242
      https://github.com/phpmyadmin/phpmyadmin/commit/cbc0b61addc2859dfa56e87d5c16a2e57e116242
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-20 (Sat, 20 Dec 2014)

  Changed paths:
    M ChangeLog
    M themes/pmahomme/css/common.css.php

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57deba856799...cbc0b61addc2