diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:16 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:27 +0200 |
| commit | 167f6dfee4d08ba092190b916afd103719456e86 (patch) | |
| tree | 714f44350d2c7b8767fd90cbac4cd3ee95fed3b0 /pkgs/development/python-modules/python-openstackclient/git@git.tavy.me:nixos | |
| parent | 8a0886a3459fbbec66e5e1b2c789d65ac0f64bed (diff) | |
| parent | acedeab23694d2b7fdcffe0dff52f98838cb23ae (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/science/astronomy/cfitsio/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-openstackclient/git@git.tavy.me:nixos')
0 files changed, 0 insertions, 0 deletions