[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f26d74: Add Docker sample for haproxy and subpath

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f26d74544b4eadaebc2b3363ceae2df8b4921264
      https://github.com/phpmyadmin/phpmyadmin/commit/f26d74544b4eadaebc2b3363ceae2df8b4921264
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  Add Docker sample for haproxy and subpath

Fixes https://github.com/phpmyadmin/docker/issues/101

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


  Commit: 52db42edfcbd60a85739409ba7a248be80bc298f
      https://github.com/phpmyadmin/phpmyadmin/commit/52db42edfcbd60a85739409ba7a248be80bc298f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M doc/setup.rst

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9859461733a2...52db42edfcbd