diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
| commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
| tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /pkgs/development/python-modules/python-sql | |
| parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
| parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions