diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
| commit | b74793bd1c458fec6e2dfc57d83ca1f33ac0f736 (patch) | |
| tree | 3a55306c8908eeecb78dedffe07bfd3e17693730 /pkgs/development/python-modules/python-sql | |
| parent | f3c994ca11ecfdf1966a143abe7a5007cc1c84e7 (diff) | |
| parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
Merge branch 'master' into staging
Conflicts:
pkgs/tools/system/facter/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions