diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-12 15:59:15 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-12 15:59:15 +0100 |
| commit | 5abe72f0b2efdd4958acb26e903973d3c624adf2 (patch) | |
| tree | 2f4f9d1dfdefdc71e75194f7b2b254b781b3d406 /pkgs/games | |
| parent | 84126e298e4a6cfe931de7903c270e07e4ef65a2 (diff) | |
| parent | b38db2c901b30a37d345751f4f6418d416e7e46e (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/mdutils/default.nix
Diffstat (limited to 'pkgs/games')
0 files changed, 0 insertions, 0 deletions