From: Jay Sitter <jay@jaysitter.com>
Date: Mon, 19 Jun 2023 03:18:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/main' into fix/fix-post-creator-alignment
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7Brss%7D?a=commitdiff_plain;h=b55cf01e722bb3fb5677ebaa73e052ba4d88a4c5;p=lemmy-ui.git

Merge remote-tracking branch 'origin/main' into fix/fix-post-creator-alignment

* origin/main:
  fix: Prettier ignore generated themes, as they aren't written by humans
  feat: Badge-ify NSFW and removed by mod title info
---

b55cf01e722bb3fb5677ebaa73e052ba4d88a4c5