diff options
| author | hut <hut@lavabit.com> | 2010-04-08 00:30:49 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-08 00:30:49 +0200 |
| commit | edf64e46b36bebc14a85e6c22280d2a6918d0bd6 (patch) | |
| tree | 12cb0fee001a861432a4e0ba02871bb73ea40fd1 /.gitignore | |
| parent | 37899948600f73c014ea6e933b2cbb85e07d9f5e (diff) | |
| parent | 27451fceeb0fdade34c51ef0b26e91bf50bae52a (diff) | |
| download | ranger-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