diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
| commit | e2c6740c37428f8d8185fcc907e9e619df50be85 (patch) | |
| tree | 13ed3247bd3f8d63305badcdf36557704e663478 /pkgs/development/python-modules/python-sql | |
| parent | a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15 (diff) | |
| parent | adaee7352bcbcaafaddf7f0a5ef8b65099e06f6e (diff) | |
Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.
Conflicts:
pkgs/data/documentation/man-pages/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions