Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a586c8ca4ff9f07c04eadb187a872d616be371a2 https://github.com/phpmyadmin/phpmyadmin/commit/a586c8ca4ff9f07c04eadb187a87... Author: Michal Čihař michal@cihar.com Date: 2017-06-01 (Thu, 01 Jun 2017)

Changed paths: M test/classes/LanguageTest.php

Log Message: ----------- Ensure we reset locales back to English after running tests

Signed-off-by: Michal Čihař michal@cihar.com

Commit: aa18cf7c902fbc24738adb07a7d9eac25ab1a8c6 https://github.com/phpmyadmin/phpmyadmin/commit/aa18cf7c902fbc24738adb07a7d9... Author: Michal Čihař michal@cihar.com Date: 2017-06-01 (Thu, 01 Jun 2017)

Changed paths: R composer.lock

Log Message: ----------- Remove composer lock from branch

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d09bba5bb6b1...aa18cf7c902f