[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 73ab7f: Allow to run setup on the demo server

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 73ab7f380bc2db43a08919247ce1fe418d412d64
      https://github.com/phpmyadmin/phpmyadmin/commit/73ab7f380bc2db43a08919247ce1fe418d412d64
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M doc/config.rst
    M setup/index.php

  Log Message:
  -----------
  Allow to run setup on the demo server

Fixes #13083

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


  Commit: 2fadf37c7dfda755aa30662b1d2ec094fe20f3f4
      https://github.com/phpmyadmin/phpmyadmin/commit/2fadf37c7dfda755aa30662b1d2ec094fe20f3f4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M doc/config.rst
    M setup/index.php

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/af0198c0f5e9...2fadf37c7dfd