diff options
| author | hut <hut@lepus.uberspace.de> | 2015-01-20 18:03:25 +0100 |
|---|---|---|
| committer | hut <hut@lepus.uberspace.de> | 2015-01-20 18:03:25 +0100 |
| commit | 241eb4d4f52692d228594d2248ae467b0f6ab128 (patch) | |
| tree | 37b2d7638c7b3bbc6fa301a5dbf4c6f8ca9062c9 /ranger | |
| parent | e3de09cf89574d3b363308f59ee573741d7ce495 (diff) | |
| parent | 6385e3a7df4fc434ce3c6449b1734a3db49a4b15 (diff) | |
| download | ranger-241eb4d4f52692d228594d2248ae467b0f6ab128.tar.gz | |
Merge branch 'master' of https://github.com/Perdu/ranger
Conflicts: ranger/config/rifle.conf
Diffstat (limited to 'ranger')
0 files changed, 0 insertions, 0 deletions