[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd
      https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Avoid listing demo.phpmyadmin.net twice

Fixes #12744

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


  Commit: ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac
      https://github.com/phpmyadmin/phpmyadmin/commit/ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M libraries/core.lib.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/df66e4fa080e...ef1f3b5cf7da