summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-02 18:42:31 +0200
committerhut <hut@lavabit.com>2011-10-02 18:42:31 +0200
commit2d199b547f5e23fbdfd0a3e24a623f5a4e792473 (patch)
treecc13140f4cc272cd79dcb71fbcb911debc69a08c /doc
parentb828e4acc86f38b8f3d857911ad2ff5dbe1a4c42 (diff)
parentfc0c76f9fa577cb8e5db2ba75963864c6ef67b33 (diff)
downloadranger-2d199b547f5e23fbdfd0a3e24a623f5a4e792473.tar.gz
Merge branch 'stable'
Conflicts:
	doc/ranger.1
	ranger/defaults/keys.py
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions