summary refs log tree commit diff stats
path: root/COPYING
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-13 12:58:02 +0200
committerhut <hut@lavabit.com>2010-04-13 12:58:02 +0200
commitbcbb7832e669ee5554cf2bbecc8c97f2d18cf27b (patch)
tree018847529c4f6bc80b88cd9f13a566ca04fb7166 /COPYING
parentbec7df57bbf04c8798328cd3b45db2d6c9e54f95 (diff)
parentcf8b174eff6a9e016903d1071289453c8d9407d5 (diff)
downloadranger-bcbb7832e669ee5554cf2bbecc8c97f2d18cf27b.tar.gz
Merge branch 'master' into newkey
Conflicts:
	ranger/defaults/keys.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions