diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-19 15:28:58 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-19 15:28:58 +0100 |
| commit | 1047ed49d929ae5a4b7cc42220fba65b44a7c0d1 (patch) | |
| tree | 8f3a390256119804c0c60f9b3b29f3f2308e8046 /pkgs/development/python-modules/python-sql | |
| parent | 3e03db11b7a41ebed671ff617082acbe1f26113f (diff) | |
| parent | 80dbdba6dda9b7adc49027de09f6db0ab2e7503c (diff) | |
Merge branch 'master' into staging
Conflicts: pkgs/os-specific/linux/kmod/default.nix cc @abbradar
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions