Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f2cb155ed13439b3ea4f4aff88919de54962b951 https://github.com/phpmyadmin/phpmyadmin/commit/f2cb155ed13439b3ea4f4aff8891... Author: Michal Čihař michal@cihar.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M libraries/server_status_monitor.lib.php

Log Message: ----------- Use same OS name on client and server

Issue #13444 and #13628

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

Commit: e781cf0c7641aae10c2c22c26a7d9b2caa044bd9 https://github.com/phpmyadmin/phpmyadmin/commit/e781cf0c7641aae10c2c22c26a7d... Author: Michal Čihař michal@cihar.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M ChangeLog M js/server_status_monitor.js

Log Message: ----------- Fixed javascript error in server monitor

Fixes #13628

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ea8fbe9c038...e781cf0c7641