diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2022-01-07 10:31:29 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-01-07 10:31:29 -0800 |
commit | 86f9a32c4c542295a9a0298db6fe998b1a14730d (patch) | |
tree | e76d24a32d8a8713c131de5cda1dc4ec514dbced /pkgs/desktops/gnome/core/epiphany/default.nix | |
parent | bd8af84d7d6b545b4269c188fa5f1ece1df38e36 (diff) | |
parent | 568e0bc498ee51fdd88e1e94089de05f2fdbd18b (diff) | |
download | nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar.gz nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar.bz2 nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar.lz nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar.xz nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.tar.zst nixpkgs-86f9a32c4c542295a9a0298db6fe998b1a14730d.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/hydra/default.nix
Diffstat (limited to 'pkgs/desktops/gnome/core/epiphany/default.nix')
0 files changed, 0 insertions, 0 deletions