summary refs log tree commit diff stats
path: root/README
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-08 01:35:18 +0200
committerhut <hut@lavabit.com>2010-04-08 01:35:18 +0200
commit21da5a5ffbe325930ef2c01b016ce68c8cff6eca (patch)
treec523c99eb2ce283ffa8d6f01158bbb63eb53f95b /README
parentef011c914dcf6061af7b30c85db53336594cab81 (diff)
parentea5a2b987dfdfa43dc302582bcf38b6953d0657b (diff)
downloadranger-21da5a5ffbe325930ef2c01b016ce68c8cff6eca.tar.gz
Merge branch 'devel' into newkey
Conflicts:
	ranger/defaults/keys.py
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions