| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200' | Alyssa Ross | 2021-09-13 |
| | | | | | | Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl | ||
| * | Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997' | Alyssa Ross | 2021-06-22 |
| # Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix | |||