diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
| commit | ef64208eba1a2b9052ce6d96b4539163d1aeda9f (patch) | |
| tree | c4fc3d5a6b5512b0e11021e18237977440207ae1 /pkgs/development/python-modules/python-sql | |
| parent | 208abe9ae3f4a3ced8942ebd3419496089e06453 (diff) | |
| parent | 3ab2949e1fdfb6ef18c2935ab3e72ea1f9348ef5 (diff) | |
Merge commit '3ab2949' from staging into master
Conflicts:
pkgs/development/compilers/llvm/6/llvm.nix
pkgs/servers/home-assistant/component-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions