summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2015-01-31 13:50:06 +0100
committerNicolargo <nicolas@nicolargo.com>2015-01-31 13:50:06 +0100
commit358bb45b4add77bf772aeded4b3e600e2c30814c (patch)
tree9a6e4700f6690b6115be8ee2e822c763fb304e43
parentc7fad235f30fb8894802da66e4f2c13eb4d04297 (diff)
parentf2096d40c3086c062f882d6f115e9dd08ae26b62 (diff)
Merge form masterv2.3
-rw-r--r--README.rst2
-rwxr-xr-xsetup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index 56dc977d..afbe90f0 100644
--- a/README.rst
+++ b/README.rst
@@ -257,4 +257,4 @@ LGPL. See ``COPYING`` for more details.
.. _@glances_system: https://twitter.com/glances_system
.. _glances-doc: https://github.com/nicolargo/glances/blob/master/docs/glances-doc.rst
.. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users
-.. _Wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F \ No newline at end of file
+.. _Wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F
diff --git a/setup.py b/setup.py
index 13c69513..a7fe0a5a 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ def get_requires():
setup(
name='Glances',
- version='2.3R',
+ version='2.3',
description="A cross-platform curses-based monitoring tool",
long_description=open('README.rst').read(),
author='Nicolas Hennion',