diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-20 22:57:23 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-20 22:57:23 +0200 |
| commit | bc1773fe16dbb1bf1e9cf0808675f6ee24b321f2 (patch) | |
| tree | 46cabc8461a9a812bd1c530d9d7924af388f2932 /pkgs/development/python-modules/GitPython | |
| parent | 01dc343c2c613c263a2180d1850847f33653f94f (diff) | |
| parent | 05c0fc15c03f1ae0580ee1cbcf7ff6261d32868c (diff) | |
Merge remote-tracking branch 'origin/staging' into systemd-219
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.4.nix
pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions