summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2015-10-04 02:12:41 +0200
committerhut <hut@lepus.uberspace.de>2015-10-04 02:13:49 +0200
commita4e19226af444e2b08432bc95b528cbd0cd463a5 (patch)
tree4d7aa558ddc141363c942979e2d5c698367bb463 /ranger
parentf8ed0eebb97c6ba725f04df168964c49fa16a541 (diff)
parenta0b6b9e0b155631866fbb7681dac2cdb577db415 (diff)
downloadranger-a4e19226af444e2b08432bc95b528cbd0cd463a5.tar.gz
Merge branch 'stable'
Conflicts:
	CHANGELOG
	CHANGELOG.md
	doc/ranger.1
        ranger/__init__.py
Diffstat (limited to 'ranger')
-rw-r--r--ranger/__init__.py2
-rwxr-xr-xranger/ext/rifle.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 8a1e7459..20c8ab35 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -14,7 +14,7 @@ import tempfile
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.7.1'
+__version__ = '1.7.2'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index 4f1ef1b9..504851b1 100755
--- a/ranger/ext/rifle.py
+++ b/ranger/ext/rifle.py
@@ -19,7 +19,7 @@ import re
 from subprocess import Popen, PIPE
 import sys
 
-__version__ = 'rifle 1.7.1'
+__version__ = 'rifle 1.7.2'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'