diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
| commit | 09d06f5ffd867afc72d5ca6786f73aed2b80e207 (patch) | |
| tree | 0b39699b6fae1ea7f5e6b40b2214c901eb9a578b /pkgs/development/python-modules/GitPython | |
| parent | f106125f77ba2b3588f95ef58667763042f808c9 (diff) | |
| parent | a49afdf1743436ac07c9be9da1d27ea5461af571 (diff) | |
Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
pkgs/development/libraries/libseccomp/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions