summary refs log tree commit diff stats
path: root/INSTALL
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-05 21:30:15 +0200
committerhut <hut@lavabit.com>2010-10-05 21:30:15 +0200
commit258a2668e6cdd34351979b8da17c6e66a738996e (patch)
treecd3406c2198daced1f12cb11c4091fa1ed99dd4c /INSTALL
parentdc7ee19fc15eee33c948d0ccd6c06df9682c0bf3 (diff)
parentd3bcb234bf5776da7d9b66e73107e906342eeb7d (diff)
downloadranger-258a2668e6cdd34351979b8da17c6e66a738996e.tar.gz
Merge branch 'stable' into preview
Conflicts:
	ranger/shared/settings.py
Diffstat (limited to 'INSTALL')
0 files changed, 0 insertions, 0 deletions