[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0d7eea: Revert "bug #2961 Relations settings not updated o...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0d7eeadba721c1249aa43f220705cf13e6cdee5e
      https://github.com/phpmyadmin/phpmyadmin/commit/0d7eeadba721c1249aa43f220705cf13e6cdee5e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Revert "bug #2961 Relations settings not updated on config change"

This reverts commit 1cc3e273086d6ecadfd33073b3a345ce6ff4126d.


  Commit: 9a5c81b5ca57d12b34d4f647d3d3714acacb7d25
      https://github.com/phpmyadmin/phpmyadmin/commit/9a5c81b5ca57d12b34d4f647d3d3714acacb7d25
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fa73a324ee56...9a5c81b5ca57