Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bde460019c32569a866b86fb733fa873fd70bcb8 https://github.com/phpmyadmin/phpmyadmin/commit/bde460019c32569a866b86fb733f... Author: long76 long76@users.noreply.github.com Date: 2020-04-14 (Tue, 04 April 2020) +02:00

Changed paths: M libraries/classes/Controllers/Server/Status/MonitorController.php M libraries/classes/Server/Status/Monitor.php

Log Message: ----------- fix #16078 - get unix timestamp for monitor

Signed-off-by: Gleb Borkov long76.git@mail.ru

Commit: 7df3db25704886d718d46257250658c4195a33f3 https://github.com/phpmyadmin/phpmyadmin/commit/7df3db25704886d718d462572506... Author: William Desportes williamdes@wdes.fr Date: 2020-04-14 (Tue, 04 April 2020) +02:00

Changed paths: M libraries/classes/Controllers/Server/Status/MonitorController.php M libraries/classes/Server/Status/Monitor.php

Log Message: ----------- Merge #16078 - fix #16078 - get unix timestamp for monitor

Pull-request: #16078 Fixes: #16078

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 87301eec85c9565b4b49417146ce025575054470 https://github.com/phpmyadmin/phpmyadmin/commit/87301eec85c9565b4b49417146ce... Author: William Desportes williamdes@wdes.fr Date: 2020-04-14 (Tue, 04 April 2020) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add a ChangeLog entry for #16078

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 7ede0d8dc4bdf6c71fbce6cd58272bc650d6ab4f https://github.com/phpmyadmin/phpmyadmin/commit/7ede0d8dc4bdf6c71fbce6cd5827... Author: William Desportes williamdes@wdes.fr Date: 2020-04-14 (Tue, 04 April 2020) +02:00

Changed paths: M .travis.yml

Log Message: ----------- Fix TravisCI gettext workaround to use gettext

Ref: https://travis-ci.community/t/support-forced-link-in-homebrew-addon/1722/2

Signed-off-by: William Desportes williamdes@wdes.fr