Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6dede8e274f09eb0db120a77158b360f8e83c5ee https://github.com/phpmyadmin/phpmyadmin/commit/6dede8e274f09eb0db120a77158b... Author: Michal Čihař michal@cihar.com Date: 2018-01-08 (Mon, 08 Jan 2018)

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

Log Message: ----------- Add demo server information to login screen

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

Commit: 8885328bbebca72ed2564cea777114f3269ca0f0 https://github.com/phpmyadmin/phpmyadmin/commit/8885328bbebca72ed2564cea7771... Author: Michal Čihař michal@cihar.com Date: 2018-01-08 (Mon, 08 Jan 2018)

Changed paths: M libraries/classes/Plugins/Auth/AuthenticationCookie.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9c29c74bbce...8885328bbebc