diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-12 23:28:12 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-12 23:28:23 +0100 |
| commit | d03d74aa67d2b49e51097329ca0757be20010c80 (patch) | |
| tree | f6c18b1255a5971d84265d3697df413904577ff5 /pkgs/development/python-modules/python-openstackclient | |
| parent | cebf6aa8fd0da7d70630eb4699ba4f7e6348d6fa (diff) | |
| parent | 6bab2b645b74c79cbc75942d84ce50fadb25dc60 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/aiopulse/default.nix
- pkgs/development/python-modules/identify/default.nix
- pkgs/development/python-modules/spur/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-openstackclient')
0 files changed, 0 insertions, 0 deletions