diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-01-09 12:11:44 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-01-09 12:16:11 +0100 |
| commit | 8ae8602bf7529fddeab29867329c21af96600a68 (patch) | |
| tree | 6d2a2df12ee53fd7e9d94188654c3aad89cfabad /pkgs/development/python-modules/rangehttpserver | |
| parent | e251591528ebecb21626f098e6ce62562568489d (diff) | |
| parent | 9ffd16b3850536094ca36bc31520bb15a6d5a9ef (diff) | |
Merge branch 'master' into staging-next
Manually resolved a conflict in
pkgs/development/libraries/libbladeRF/default.nix.
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions