Jonathan Ringer c1f8a15dac Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix		2021-05-19 10:39:54 -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	matrix-synapse: 1.33.2 -> 1.34.0	2021-05-17 13:44:48 +02:00
homeserver-script.patch	matrix-synapse: 1.0.0 -> 1.1.0	2019-07-06 15:09:27 +02:00