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

Changed paths: M .travis.yml

Log Message: ----------- Increase memory limit for OSX tests

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

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

Changed paths: M .travis.yml

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/90a6678500dd...0893c067a7ac