Merge branch 'main' of gitlab.com:famedly/fluffychat

This commit is contained in:
Krille Fear 2021-10-09 08:13:14 +02:00
commit 72d1a9b66c

View File

@ -182,4 +182,4 @@ location /_matrix/push/v1/notify {
* <a href="https://github.com/googlefonts/noto-emoji/">Noto Emoji Font</a> for the awesome emojis.
* The Matrix Foundation for making and maintaining the [emoji translations](https://github.com/matrix-org/matrix-doc/blob/master/data-definitions/sas-emoji.json) used for emoji verification, licensed Apache 2.0
* The Matrix Foundation for making and maintaining the [emoji translations](https://github.com/matrix-org/matrix-doc/blob/main/data-definitions/sas-emoji.json) used for emoji verification, licensed Apache 2.0