Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c0450b29157d180014ab719c0e870f44cb79ca02 https://github.com/phpmyadmin/phpmyadmin/commit/c0450b29157d180014ab719c0e87... Author: Michal Čihař michal@cihar.com Date: 2016-07-12 (Tue, 12 Jul 2016)

Changed paths: M .travis.yml

Log Message: ----------- Remove allowed failures test from maintenance branch

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

Commit: e3cf00b1225a940a2f457593cfe825a1bde1c6fd https://github.com/phpmyadmin/phpmyadmin/commit/e3cf00b1225a940a2f457593cfe8... Author: Michal Čihař michal@cihar.com Date: 2016-07-12 (Tue, 12 Jul 2016)

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

Commit: a6eaffe11ca3a451de591698aeddf787252ab653 https://github.com/phpmyadmin/phpmyadmin/commit/a6eaffe11ca3a451de591698aedd... Author: Michal Čihař michal@cihar.com Date: 2016-07-12 (Tue, 12 Jul 2016)

Changed paths: M doc/credits.rst M doc/faq.rst M doc/glossary.rst

Log Message: ----------- Use https URL for tcpdf

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0ce8cd7919a1...a6eaffe11ca3