diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2014-04-20 19:17:05 +0100 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2014-04-20 19:17:05 +0100 |
| commit | 42ae633445a72c4673b4abc3e214a2ddc8227724 (patch) | |
| tree | 0b19dfa036d81786f15348a60d31dbdefbacf986 /pkgs/development/python-modules/GitPython | |
| parent | 41775167ac69a001f40c11e2ee9576887e17b8b4 (diff) | |
| parent | 31a94915d2532273e3630206a9e13f2e49ce0775 (diff) | |
Merge branch 'master' into dbus-switch-to-configuration
Conflicts:
nixos/modules/system/activation/switch-to-configuration.pl
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions