diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-29 16:27:23 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-29 16:27:23 -0500 |
| commit | e10d27e50305877ec078b6ccf8431f433317477c (patch) | |
| tree | 2f0490b58c7a0f051a4b3281263ecb7c39668d32 /pkgs/development/python-modules/python-openstackclient | |
| parent | 1ec3314344cb9fb2716c2a8f7aff773790153eaf (diff) | |
| parent | 3197830cbed3cb93e76f171ad320c97be13293d5 (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/development/python-modules/mautrix/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-openstackclient')
0 files changed, 0 insertions, 0 deletions