diff options
| author | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:54:19 -0600 |
|---|---|---|
| committer | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:54:19 -0600 |
| commit | 2784866ffdcd54e7dbc3e2ee7ac31adf6c8077db (patch) | |
| tree | 1db0d6305ca9dc9ad4767c46a88731a006b3c7fb /pkgs/development/python-modules/httpserver | |
| parent | c977673bb53b632f50f368b4aab69eb3d5a7f9b9 (diff) | |
| parent | 13befa3979d6ac98a96880fba9a3239bc333e644 (diff) | |
Merge branch 'master' into nitrogen. Added maintainer and license.
Conflicts:
pkgs/tools/X11/nitrogen/default.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions