Resolve conflict with master branch

pull/1866/head v3.1.7
nicolargo 2021-05-02 16:36:10 +02:00
commit 69b6390f45
1 changed files with 25 additions and 20 deletions

View File

@ -2,8 +2,11 @@
Glances Version 3
==============================================================================
===============
Version 3.1.7
=============
===============
Enhancements and bug corrected:
* Security audit - B411 #1025 (by nicolargo)
* GPU temperature not shown in webview #1849 (by nicolargo)
@ -11,7 +14,7 @@ Version 3.1.7
* Replace Travis by Github action #1850 (by nicolargo)
* '/api/3/processlist/pid/3936'use this api can't get right info,all messy code #1828 (by nicolargo)
* Refactor the way importants stats are displayed #1826 (by nicolargo)
* Reaplly the Add hide option to sensors plugin #1596 PR (by nicolargo)
* Re-apply the Add hide option to sensors plugin #1596 PR (by nicolargo)
* Smart plugin error while start glances as root #1806 (by nicolargo)
* Plugin quicklook takes more than one seconds to update #1820 (by nicolargo)
* Replace Pystache by Chevron 2/2 See #1817 (by nicolargo)
@ -19,6 +22,7 @@ Version 3.1.7
* Update docs following PR #1798 (by nicolargo)
Contributors for this version:
- Nicolargo
- Deosrc
- dependabot[bot]
@ -27,6 +31,7 @@ Contributors for this version:
- Stefan Eßer
- Tuux
===============
Version 3.1.6.2
===============