diff options
| author | hut <hut@lavabit.com> | 2011-10-11 22:34:21 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-11 22:34:21 +0200 |
| commit | 30a35e6a7b95a06709590dc56afb96ea7ccecb62 (patch) | |
| tree | c44a71f9502dd08e5f1917ceb0f0f33fe3efe57f /code/environment.py | |
| parent | 6524d00c5ce0d1169645a879fe581ee29d91b33c (diff) | |
| parent | 6f695ffeafd1d2f1cb7c0c201b395582a1f7ce4e (diff) | |
| download | ranger-30a35e6a7b95a06709590dc56afb96ea7ccecb62.tar.gz | |
Merge branch 'master' into stable
Conflicts: ranger/defaults/options.py
Diffstat (limited to 'code/environment.py')
0 files changed, 0 insertions, 0 deletions