Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8ed94542c071f9175bbfdae3c82c581d595d2f68 https://github.com/phpmyadmin/phpmyadmin/commit/8ed94542c071f9175bbfdae3c82c... Author: Michal Čihař michal@cihar.com Date: 2017-10-31 (Tue, 31 Oct 2017)

Changed paths: M doc/conf.py

Log Message: ----------- Workaround SNI problems on readthedocs.org

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

Commit: 931c1c7f72fd449ca4e9533f10ff9dfc297970e4 https://github.com/phpmyadmin/phpmyadmin/commit/931c1c7f72fd449ca4e9533f10ff... Author: Michal Čihař michal@cihar.com Date: 2017-10-31 (Tue, 31 Oct 2017)

Changed paths: M doc/conf.py

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a513a7550ac6...931c1c7f72fd