Merge branch 'master' into develop

This commit is contained in:
nicolargo 2016-03-26 17:46:11 +01:00
commit 11659ac002

View File

@ -13,7 +13,7 @@ patches and features.
## Using the issue tracker
The [issue tracker](https://github.com/nicolargos/glances/issues) is
The [issue tracker](https://github.com/nicolargo/glances/issues) is
the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:
@ -46,7 +46,11 @@ Example:
> Short and descriptive example bug report title
>
> A summary of the issue and the browser/OS environment in which it occurs. If
> Glances and PsUtil version used (glances -V)
>
> Operating system description (name and version).
>
> A summary of the issue and the OS environment in which it occurs. If
> suitable, include the steps required to reproduce the bug.
>
> 1. This is the first step