Merge branch 'master' into federation

diff --cc .gitignore
index 919358cf15db6dbafc62b93d71211709fe437532,9f7fa1e3c6930299976d9bab212b53ec509d4d9c..5e221b03828c692dffef140ce8128a4ec99d49ad
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,16 -1,10 +2,16 @@@
  ansible/inventory
  ansible/inventory_dev
  ansible/passwords/
 +
 +# docker build files
  docker/lemmy_mine.hjson
  docker/dev/env_deploy.sh
 +docker/federation-test/volumes
 +docker/dev/volumes
 +
 +# local build files
  build/
 -.idea/
  ui/src/translations
 -docker/dev/volumes
 -docker/federation-test/volumes
 +
 +# ide config
- .idea/
++.idea/

diff --cc server/src/lib.rs
Simple merge

diff --cc server/src/websocket/server.rs
Simple merge