Jonathan Ringer 14f3686af1 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/terminal-emulators/alacritty/default.nix pkgs/servers/clickhouse/default.nix		2021-05-20 09:12:42 -07:00
..
matrix-appservice-irc	nixos/tests/matrix-appservice-irc: init	2021-04-01 01:17:24 +02:00
matrix-appservice-slack	matrix-appservice-slack: 1.7.0 -> 1.8.0	2021-05-06 20:36:12 +02:00
plugins	matrix-synapse-plugins.matrix-synapse-shared-secret-auth: init at 1.0.2 (#112671)	2021-03-13 08:45:15 +01:00
tools	treewide: fix cargoSha256/cargoHash	2021-05-08 00:36:37 -07:00
default.nix	Merge pull request #123693 from mayflower/matrix-openssl	2021-05-20 11:05:02 +02:00
homeserver-script.patch