diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 13:46:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 13:46:46 +0200 |
| commit | 1278859d3167b9f84bfab680d9c8c463adf64a60 (patch) | |
| tree | bc090295f32889e68e2e6407cf8888021b3595e4 /pkgs/development/python-modules/rangehttpserver | |
| parent | d4561be1cb5032c00cf97fc82397f1307f156996 (diff) | |
| parent | 0c020c98f9d4f49d5c9907db5f4b35aac7df959b (diff) | |
Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions