develop #25

Manually merged
samuel-p merged 11 commits from develop into master 2020-08-28 22:58:48 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit cfd940a207 - Show all commits

View file

@ -19,3 +19,4 @@ Melde dich gerne auf meinem Server an oder suche dir einen aus der unten verlink
* [Liste öffentlicher Räume](https://view.matrix.org/) * [Liste öffentlicher Räume](https://view.matrix.org/)
* [Liste öffentlicher Matrix-Server](https://www.hello-matrix.net/public_servers.php) * [Liste öffentlicher Matrix-Server](https://www.hello-matrix.net/public_servers.php)
* [Matrix FAQ](https://matrix.org/faq/) * [Matrix FAQ](https://matrix.org/faq/)
* [Account umziehen](https://ems.element.io/tools/matrix-migration)

View file

@ -19,3 +19,4 @@ Feel free to create an account on my server or choose one from the list linked b
* [List of public rooms](https://view.matrix.org/) * [List of public rooms](https://view.matrix.org/)
* [List of public matrix servers](https://www.hello-matrix.net/public_servers.php) * [List of public matrix servers](https://www.hello-matrix.net/public_servers.php)
* [Matrix FAQ](https://matrix.org/faq/) * [Matrix FAQ](https://matrix.org/faq/)
* [Migrate Account](https://ems.element.io/tools/matrix-migration)