Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2d316e47e1f3e9447892f61116f1599702782777 https://github.com/phpmyadmin/phpmyadmin/commit/2d316e47e1f3e9447892f61116f1... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Add missing escaping in sample regexp Fixes #12594 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a8783aabec3f563b769f30bf96b04319a7c60c7f https://github.com/phpmyadmin/phpmyadmin/commit/a8783aabec3f563b769f30bf96b0... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/02eeb21df848...a8783aabec3f