[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 461035: Fix parameter type

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 461035cbed8fbaaf511296fe03a4e1561c7e3bd4
      https://github.com/phpmyadmin/phpmyadmin/commit/461035cbed8fbaaf511296fe03a4e1561c7e3bd4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 726e291beb9168335e88e44fcbe6e1238856611f
      https://github.com/phpmyadmin/phpmyadmin/commit/726e291beb9168335e88e44fcbe6e1238856611f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ab363605f964...726e291beb91