diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-09 13:07:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-09 13:07:48 +0200 |
| commit | b9d42f79c979489d678e99b0faa2fc6e0a8977dc (patch) | |
| tree | da4fd90a0f8b875e9ce34c799ae8847d03c88958 /pkgs/development/python-modules/python-sql | |
| parent | e9d3acbaf1a7f84065148f1808bbfb40ba2c783f (diff) | |
| parent | cc174b3d556945eff999efe44ab18dd7b3e99f76 (diff) | |
Merge recent master into staging
This would be a fast-forward, but --no-ff seems cleaner in this case.
Hydra nixpkgs: ?compare=1278067
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions