diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-02-01 12:24:57 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-02-01 12:25:11 +0100 |
| commit | 27fa02d0f19b46920eaf78f74c6b700e31086379 (patch) | |
| tree | 715ce671c4de5ecc52d4d40aa40a0b16cfd2ba00 /pkgs/development/python-modules/python-openstackclient | |
| parent | a7e73864b4d7a8dbd9df8e144e612ed1ed5577d4 (diff) | |
| parent | 2c582510dbd6657db54222db0567e7c34bd9bb24 (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/development/compilers/llvm/10/clang/default.nix
- pkgs/development/compilers/llvm/8/clang/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-openstackclient')
0 files changed, 0 insertions, 0 deletions