Merge master into i18n branch #1454

Merged
djoate merged 103 commits from i18n into i18n 2019-11-02 20:43:17 +00:00
Showing only changes of commit eb1aefcd07 - Show all commits

View File

@@ -17,7 +17,7 @@ It's very important to us to stay up-to-date on the latest changes in the privac
For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms.
<span class="text-success"><i class="fas fa-comment"></i> New:</span> We're now on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client! If you prefer XMPP, you're welcome to [use the Matrix.org XMPP bridge to join the discussion](https://conversations.im/j/%23general%23privacytools.io@bridge.xmpp.matrix.org).
We're on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client!
## Abuse