diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-23 10:14:19 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-23 10:14:19 -0800 |
commit | 5ed396a9129123575185dc5410dfda25f330d499 (patch) | |
tree | 0144f084aa63ab7173e5683756c6d0dde59eea3b /pkgs/tools/misc/mcfly | |
parent | 7d1034b04d6aae80f61d932df1fab4981163f647 (diff) | |
parent | e2b2136d6302cd2936b49eeda58b55816758a3aa (diff) | |
download | nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar.gz nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar.bz2 nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar.lz nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar.xz nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.tar.zst nixpkgs-5ed396a9129123575185dc5410dfda25f330d499.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
Diffstat (limited to 'pkgs/tools/misc/mcfly')
0 files changed, 0 insertions, 0 deletions