Skip to content
  • Claire's avatar
    Merge branch 'main' into glitch-soc/merge-upstream · 93912f04
    Claire authored
    Conflicts:
    - `app/models/account.rb`:
      Conflict because we (glitch-soc) have disabled trending of posts without
      review.
      Discarded that upstream change.
    - `app/views/admin/settings/discovery/show.html.haml`:
      Just an extra setting in glitch-soc.
      Kept that extra setting.
    93912f04
After you've reviewed these contribution guidelines, you'll be all set to contribute to this project.