[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 99ef49: bug #4057 db/table query string parameters no long...

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 99ef493ebba9529b88d50087c44a91de8b386878
      https://github.com/phpmyadmin/phpmyadmin/commit/99ef493ebba9529b88d50087c44a91de8b386878
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M index.php

  Log Message:
  -----------
  bug #4057 db/table query string parameters no longer work

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 783e28f1608012c790cf6e1cb04e717a21019bbd
      https://github.com/phpmyadmin/phpmyadmin/commit/783e28f1608012c790cf6e1cb04e717a21019bbd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M ChangeLog
    M index.php

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

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


  Commit: 02fcb6e7460818643a458e5a2791ebe1b5a52a49
      https://github.com/phpmyadmin/phpmyadmin/commit/02fcb6e7460818643a458e5a2791ebe1b5a52a49
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Add FAQ reference

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1110d087433a...02fcb6e74608