Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53a51b953c7813204f70c2bed8d91daa26151e0a https://github.com/phpmyadmin/phpmyadmin/commit/53a51b953c7813204f70c2bed8d9... Author: Michal Čihař michal@cihar.com Date: 2016-04-25 (Mon, 25 Apr 2016)

Changed paths: M doc/config.rst

Log Message: ----------- Document when ssl_verify was added

Issue #12146

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

Commit: bd19498ed23507e5526e51b6ba5c61d9ff653ade https://github.com/phpmyadmin/phpmyadmin/commit/bd19498ed23507e5526e51b6ba5c... Author: Michal Čihař michal@cihar.com Date: 2016-04-25 (Mon, 25 Apr 2016)

Changed paths: M doc/config.rst

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5637dfb44b92...bd19498ed235