Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6879923acc50842029541f6602a54b3600df6e34 https://github.com/phpmyadmin/phpmyadmin/commit/6879923acc50842029541f6602a5... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Do not show warning about short blowfish_secret if none is set With empty blowfish_secret user would always get both warnings... Fixes #12485 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 8d46edc4b6fd6028e0942e37685be537defde17f https://github.com/phpmyadmin/phpmyadmin/commit/8d46edc4b6fd6028e0942e37685b... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/31f6d7640515...8d46edc4b6fd