[phpMyAdmin Git] [phpmyadmin/phpmyadmin] aa39b4: Release 4.7.4

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aa39b4a93ad560ab68fce4fb84216b63adbb2102
      https://github.com/phpmyadmin/phpmyadmin/commit/aa39b4a93ad560ab68fce4fb84216b63adbb2102
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Release 4.7.4

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


  Commit: 68cdc27e04babe040628eee67ad0bf55c0305db0
      https://github.com/phpmyadmin/phpmyadmin/commit/68cdc27e04babe040628eee67ad0bf55c0305db0
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    A composer.lock

  Log Message:
  -----------
  Adding composer lock for 4.7.4

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


  Commit: 748fac446b839b122a38def7656b26df1a9c489b
      https://github.com/phpmyadmin/phpmyadmin/commit/748fac446b839b122a38def7656b26df1a9c489b
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Prepare for 4.7.5-dev

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


  Commit: ce53eb106468d5f4ea966fa2f21d4143a3335294
      https://github.com/phpmyadmin/phpmyadmin/commit/ce53eb106468d5f4ea966fa2f21d4143a3335294
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M ChangeLog
    A composer.lock

  Log Message:
  -----------
  Merge QA_4_7 changes from releasing 4.7.4; fix merge conflicts

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


  Commit: 3fb96a1758429175aa7ce1d6ede637109e7cb319
      https://github.com/phpmyadmin/phpmyadmin/commit/3fb96a1758429175aa7ce1d6ede637109e7cb319
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    R composer.lock

  Log Message:
  -----------
  Remove composer.lock

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1e36be831ebb...3fb96a175842