Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '93883402a445ad467320925a0a5dbe43a949f25b' | Alyssa Ross | 2022-03-11 |
| | | | | | | | | | | Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix | ||
* | Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42' | Alyssa Ross | 2021-09-13 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | |||
* | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | |||
* | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | |||
* | Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af' | Alyssa Ross | 2019-05-07 |