[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fe7c88: Add multi server example to the docs (from wiki)

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fe7c8817452b8e0fc6ba4722c14bb04f646d9b84
      https://github.com/phpmyadmin/phpmyadmin/commit/fe7c8817452b8e0fc6ba4722c14bb04f646d9b84
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M doc/config.rst

  Log Message:
  -----------
  Add multi server example to the docs (from wiki)

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


  Commit: a57027fcd81e14283aaa8079b4af48333fc1a174
      https://github.com/phpmyadmin/phpmyadmin/commit/a57027fcd81e14283aaa8079b4af48333fc1a174
  Author: Tiago França EJessica <tiago_pvo at hotmail.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 93.4% (3002 of 3211 strings)

[CI skip]


  Commit: 90b126beed7877e98934b7a649180cbe58c464a3
      https://github.com/phpmyadmin/phpmyadmin/commit/90b126beed7877e98934b7a649180cbe58c464a3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    A .weblate

  Log Message:
  -----------
  Add Weblate (wlc) configuration

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


  Commit: 870a063062db277e54b094caa2c9fc6c56b69d1d
      https://github.com/phpmyadmin/phpmyadmin/commit/870a063062db277e54b094caa2c9fc6c56b69d1d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Log Message:
  -----------
  Merge commit 'a57027fcd81e14283aaa8079b4af48333fc1a174'


  Commit: b27c24064cf12703f89498ee9f251c478a65f583
      https://github.com/phpmyadmin/phpmyadmin/commit/b27c24064cf12703f89498ee9f251c478a65f583
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    A .weblate

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


  Commit: 087b54b25376586f16601c6d3ceedff22f3cd16d
      https://github.com/phpmyadmin/phpmyadmin/commit/087b54b25376586f16601c6d3ceedff22f3cd16d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M .weblate

  Log Message:
  -----------
  Adjust Weblate setup to master branch

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


  Commit: 1cd936e7b3e0a053321cecf708bff1a3769438ed
      https://github.com/phpmyadmin/phpmyadmin/commit/1cd936e7b3e0a053321cecf708bff1a3769438ed
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Remove Weblate configuration on release

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9404518c3928...1cd936e7b3e0