[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c47d3c: Prepare release 4.8.0

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c47d3c82dc4b6ecfcb72c7eb70f35514a5417e7d
      https://github.com/phpmyadmin/phpmyadmin/commit/c47d3c82dc4b6ecfcb72c7eb70f35514a5417e7d
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-04-07 (Sat, 07 Apr 2018)

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

  Log Message:
  -----------
  Prepare release 4.8.0

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


  Commit: 9d6ac04ae8cd7064c28c93a6a949cb5324899593
      https://github.com/phpmyadmin/phpmyadmin/commit/9d6ac04ae8cd7064c28c93a6a949cb5324899593
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-04-07 (Sat, 07 Apr 2018)

  Changed paths:
    A composer.lock

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

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


  Commit: fd02d1686e8bedc9e89a8dbe1b1f4ace27a1257a
      https://github.com/phpmyadmin/phpmyadmin/commit/fd02d1686e8bedc9e89a8dbe1b1f4ace27a1257a
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-04-07 (Sat, 07 Apr 2018)

  Changed paths:
    R composer.lock

  Log Message:
  -----------
  Removing composer.lock

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


  Commit: 22233f72a5fd59198b99a2a92967c9a8b1aab068
      https://github.com/phpmyadmin/phpmyadmin/commit/22233f72a5fd59198b99a2a92967c9a8b1aab068
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-04-08 (Sun, 08 Apr 2018)

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

  Log Message:
  -----------
  Prepare for 4.8.1-dev

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


  Commit: c5e6cfed591b647787b38c5f2adb3565177d57e1
      https://github.com/phpmyadmin/phpmyadmin/commit/c5e6cfed591b647787b38c5f2adb3565177d57e1
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflicts from the release of 4.8.0

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2aaad5b0927f...c5e6cfed591b