summary refs log tree commit diff stats
path: root/setup.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2012-08-10 16:20:00 +0200
committerhut <hut@lavabit.com>2012-08-10 16:20:00 +0200
commit60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7 (patch)
tree3c84ad570ca947fdc12757103f642c08e34fd06b /setup.py
parent8bd08cae83e091dce189ab8c84db468631c58e13 (diff)
parent60a6b7e639666051e8b7288b932498b19c299a00 (diff)
downloadranger-60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7.tar.gz
Merge branch 'stable'
Conflicts:
	doc/ranger.1
	ranger/defaults/apps.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions