diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-04-16 21:11:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-04-16 21:13:30 +0300 |
| commit | 16b45ec3da52bf91dea8821d34882dd3afa8a38b (patch) | |
| tree | 80de2f49c97b4c3a2258c62240a2206073ff2afb /pkgs/development/python-modules/GitPython | |
| parent | c0e58f80748b8fb120f1ff674240c37dcf8396cf (diff) | |
| parent | 333a24a628391137a7283f09498edd5822f12023 (diff) | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/unix-tools.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions