From: Felix Ableitner <me@nutomic.com>
Date: Wed, 18 Mar 2020 21:51:34 +0000 (+0100)
Subject: Merge branch 'master' into federation
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/%7Bpost_view.post.url%7D?a=commitdiff_plain;h=33cce053003f04a0c4e3cacae3d8caeb93f96a4a;p=lemmy.git

Merge branch 'master' into federation
---

33cce053003f04a0c4e3cacae3d8caeb93f96a4a
diff --cc .gitignore
index 919358cf,9f7fa1e3..5e221b03
--- a/.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/