about summary refs log tree commit diff
path: root/nixpkgs/pkgs/servers/mautrix-discord
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-02-13
| | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-01
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵Alyssa Ross2023-11-16
| | | | HEAD
* Merge branch 'staging' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-22
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-15
|
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-01