diff options
| author | hut <hut@lavabit.com> | 2010-04-13 12:58:02 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-13 12:58:02 +0200 |
| commit | bcbb7832e669ee5554cf2bbecc8c97f2d18cf27b (patch) | |
| tree | 018847529c4f6bc80b88cd9f13a566ca04fb7166 /test/tc_bookmarks.py | |
| parent | bec7df57bbf04c8798328cd3b45db2d6c9e54f95 (diff) | |
| parent | cf8b174eff6a9e016903d1071289453c8d9407d5 (diff) | |
| download | ranger-bcbb7832e669ee5554cf2bbecc8c97f2d18cf27b.tar.gz | |
Merge branch 'master' into newkey
Conflicts: ranger/defaults/keys.py
Diffstat (limited to 'test/tc_bookmarks.py')
0 files changed, 0 insertions, 0 deletions