Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2559d3e448cddd8da4d536b453b10cec7f0d3349 https://github.com/phpmyadmin/phpmyadmin/commit/2559d3e448cddd8da4d536b453b1... Author: Franco <fulanodetal.github1@openaliasbox.org> Date: 2017-02-04 (Sat, 04 Feb 2017) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (3199 of 3199 strings) [CI skip] Commit: 87ebf137c1554cae67a4fa1e161af8952fe56545 https://github.com/phpmyadmin/phpmyadmin/commit/87ebf137c1554cae67a4fa1e161a... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M doc/setup.rst Log Message: ----------- Add example for customizing configuration file using docker-compose Fixes https://github.com/phpmyadmin/docker/issues/82 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 7a2222ae76983349eca9193a673c6f1fa9ae081b https://github.com/phpmyadmin/phpmyadmin/commit/7a2222ae76983349eca9193a673c... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Log Message: ----------- Merge commit '2559d3e448cddd8da4d536b453b10cec7f0d3349' Commit: 474cda3c90967dd9ca3351e67bbbaf49642280a1 https://github.com/phpmyadmin/phpmyadmin/commit/474cda3c90967dd9ca3351e67bbb... Author: Michal Čihař <michal@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/8a6d7dec2377...474cda3c9096