[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4df652: Add information about required and suggested exten...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4df65209a1fa91b8d981af0ecdd171596606d8f7
      https://github.com/phpmyadmin/phpmyadmin/commit/4df65209a1fa91b8d981af0ecdd171596606d8f7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M ChangeLog
    M composer.json

  Log Message:
  -----------
  Add information about required and suggested extensions to composer.json

Fixes #12785

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 28f4ebcc0e07304bd8fb3faa7d488b0f30f34d61
      https://github.com/phpmyadmin/phpmyadmin/commit/28f4ebcc0e07304bd8fb3faa7d488b0f30f34d61
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M ChangeLog
    M composer.json

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0be67f6a73a6...28f4ebcc0e07