Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 391c79e17728c394b7fde74184f0f7f55c97b881 https://github.com/phpmyadmin/phpmyadmin/commit/391c79e17728c394b7fde74184f0... Author: Franco <fulanodetal.github1@openaliasbox.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 59934c2914eec9406b70771f74522a0299350093 https://github.com/phpmyadmin/phpmyadmin/commit/59934c2914eec9406b70771f7452... Author: Weblate <noreply@weblate.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M phpunit.xml.dist Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 7ad21270c45e512f91da03698de67fb6111b21a8 https://github.com/phpmyadmin/phpmyadmin/commit/7ad21270c45e512f91da03698de6... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: R test/.htaccess Log Message: ----------- Remove .htaccess from tests Issue #12348 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 5cc8f7ebea6979a12230bb27bc06995b027482ab https://github.com/phpmyadmin/phpmyadmin/commit/5cc8f7ebea6979a12230bb27bc06... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-19 (Mon, 19 Dec 2016) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' Commit: 0292859e2c46e202ed4f7867e9093a74954feca0 https://github.com/phpmyadmin/phpmyadmin/commit/0292859e2c46e202ed4f7867e909... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: R test/.htaccess Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/677d1cd640cf...0292859e2c46