diff options
| author | hut <hut@lavabit.com> | 2010-04-08 01:35:18 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-08 01:35:18 +0200 |
| commit | 21da5a5ffbe325930ef2c01b016ce68c8cff6eca (patch) | |
| tree | c523c99eb2ce283ffa8d6f01158bbb63eb53f95b /test | |
| parent | ef011c914dcf6061af7b30c85db53336594cab81 (diff) | |
| parent | ea5a2b987dfdfa43dc302582bcf38b6953d0657b (diff) | |
| download | ranger-21da5a5ffbe325930ef2c01b016ce68c8cff6eca.tar.gz | |
Merge branch 'devel' into newkey
Conflicts: ranger/defaults/keys.py
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions