Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 833223654ae0b35d573c667756e1d0bad851e022 https://github.com/phpmyadmin/phpmyadmin/commit/833223654ae0b35d573c667756e1... Author: Michal Čihař michal@cihar.com Date: 2017-06-02 (Fri, 02 Jun 2017)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php

Log Message: ----------- Fixed direct login for accounts without password

Fixes #13311

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

Commit: 2af08b93f10660db3e14884ff792ed153ec9df50 https://github.com/phpmyadmin/phpmyadmin/commit/2af08b93f10660db3e14884ff792... Author: Michal Čihař michal@cihar.com Date: 2017-06-02 (Fri, 02 Jun 2017)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fe3f8ce0eaca...2af08b93f106