[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5a7d7f: Make PHPCS happy.

[Hugues Peccatte]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5a7d7fb3ab26f2985230eccff1ecd5dac77ddad8
      https://github.com/phpmyadmin/phpmyadmin/commit/5a7d7fb3ab26f2985230eccff1ecd5dac77ddad8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-09-19 (Sat, 19 Sep 2015)

  Changed paths:
    M export.php
    M normalization.php
    M server_privileges.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Make PHPCS happy.

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


  Commit: 3281811f8d78741d73c0df888ce8c031450af390
      https://github.com/phpmyadmin/phpmyadmin/commit/3281811f8d78741d73c0df888ce8c031450af390
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-09-26 (Sat, 26 Sep 2015)

  Changed paths:
    M ChangeLog
    M doc/require.rst
    M js/functions.js
    M js/server_databases.js
    M js/sql.js
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/StorageEngine.class.php
    M libraries/Util.class.php
    A libraries/VersionInformation.php
    M libraries/common.inc.php
    M libraries/controllers/DatabaseStructureController.class.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/server_privileges.lib.php
    M libraries/sql-parser/src/Components/Key.php
    M libraries/sql-parser/src/Utils/Table.php
    M libraries/sql.lib.php
    M po/ca.po
    M po/de.po
    M po/pl.po
    M po/pt_BR.po
    M po/sk.po
    M po/zh_CN.po
    M setup/frames/index.inc.php
    M setup/lib/index.lib.php
    M test/classes/PMA_Util_test.php
    A test/classes/VersionInformation_test.php
    M version_check.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d5788dbc7c4f...3281811f8d78