diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-28 18:49:09 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-28 18:49:09 -0500 |
| commit | 3961a789eb6c8fe410c70c2f42e1c65b2b656fa8 (patch) | |
| tree | 83bf759e8f0c8c226ced2154cdff33dd0d756033 /pkgs/development/python-modules/python-openstackclient | |
| parent | 2e759d4fd076ad61a6805d4079af85062288be71 (diff) | |
| parent | eaeea6e9337b93d2acb7c2aa27e3f4617408375a (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/development/python-modules/fe25519/default.nix
pkgs/development/python-modules/fountains/default.nix
pkgs/development/python-modules/humanize/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-openstackclient')
0 files changed, 0 insertions, 0 deletions