diff options
| author | Perry Barnoy <pjbarnoy@gmail.com> | 2015-10-19 14:10:40 -0400 |
|---|---|---|
| committer | Perry Barnoy <pjbarnoy@gmail.com> | 2015-10-19 14:10:40 -0400 |
| commit | 7df323125ff7cc8421f552374ff3ab1b0c6ccc89 (patch) | |
| tree | 937df3615ce13aa9bb8a28def67468fe57ca83f6 /pkgs/development/python-modules/python-sql | |
| parent | 3d1797160fa67aa9ecbb9f0cb0c3ee5c96f7ac0d (diff) | |
| parent | 48d837f31004f33683df1af1b074ccf547658110 (diff) | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs into xfce4-whiskermenu-plugin
Pull from nixpkgs/master to resolve Travis CI build conflicts.
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions