diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-01-10 16:09:42 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-01-10 16:09:52 +0100 |
| commit | 10b01dcc8907eb56a67a14fb210f7c5be1c8a2e5 (patch) | |
| tree | daeae66b677e82faa252f0721af6f2e40411e39b /maintainers | |
| parent | 3c4b68b54d7123b14ff0c5c40e67883c32afe3dd (diff) | |
| parent | fb8c64e6a1d68202edc93d284eb491fd266db0d0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/types-setuptools/default.nix
Diffstat (limited to 'maintainers')
0 files changed, 0 insertions, 0 deletions