Update matrix-appservice-discord feature set#2691

HarHarLinks merged 2 commits intomainmatrix-org/matrix.org:mainfrom

HarHarLinks/matrix-appservice-discordmatrix-org/matrix.org:HarHarLinks/matrix-appservice-discordCopy head branch name to clipboard