[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e5edef: English-language fixup.

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e5edef4639432cd5815f1f83a51c16b0f8bc497c
      https://github.com/phpmyadmin/phpmyadmin/commit/e5edef4639432cd5815f1f83a51c16b0f8bc497c
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  English-language fixup.

Thanks to "rafpaf" for noticing this at https://github.com/phpmyadmin/phpmyadmin/pull/13997

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: b07b28b74cdd911cfff5b55cb70d85c1801e84f4
      https://github.com/phpmyadmin/phpmyadmin/commit/b07b28b74cdd911cfff5b55cb70d85c1801e84f4
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  Merge branch 'QA_4_7'


  Commit: 466e11f8828921c4b91d84eaa376242985c1e485
      https://github.com/phpmyadmin/phpmyadmin/commit/466e11f8828921c4b91d84eaa376242985c1e485
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M examples/signon.php
    M export.php
    M import.php
    M index.php
    M libraries/classes/Config.php
    M libraries/classes/Config/ServerConfigChecks.php
    M libraries/classes/Core.php
    M libraries/classes/Display/Export.php
    M libraries/classes/Display/Import.php
    M libraries/classes/Encoding.php
    M libraries/classes/Export.php
    M libraries/classes/File.php
    M libraries/classes/FileListing.php
    M libraries/classes/Header.php
    M libraries/classes/Session.php
    M libraries/classes/Tracking.php
    M tbl_get_field.php
    M test/classes/ConfigTest.php
    M test/classes/EncodingTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4c04093a3538...466e11f88289