summary refs log tree commit diff stats
path: root/.gitignore
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-08 00:30:49 +0200
committerhut <hut@lavabit.com>2010-04-08 00:30:49 +0200
commitedf64e46b36bebc14a85e6c22280d2a6918d0bd6 (patch)
tree12cb0fee001a861432a4e0ba02871bb73ea40fd1 /.gitignore
parent37899948600f73c014ea6e933b2cbb85e07d9f5e (diff)
parent27451fceeb0fdade34c51ef0b26e91bf50bae52a (diff)
downloadranger-edf64e46b36bebc14a85e6c22280d2a6918d0bd6.tar.gz
Merge branch 'master' into devel
Conflicts:
	ranger/core/actions.py
	ranger/defaults/keys.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions