diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
| commit | aadaa913792b0fdeb68b02425e4f03d2f8286a1f (patch) | |
| tree | ea582b078a00e6ba27e2c887a9df5a792c37fb0e /pkgs/development/python-modules/python-sql | |
| parent | 2362891dc815160e343e52458f25db22508ac487 (diff) | |
| parent | e7d3166656af0d98da9f59c78e2213cec842d743 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions