Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`

2023-12-10 18:05:02 +01:00

..

challenges

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

confirmations

Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)

2023-10-25 21:33:44 +00:00

passwords

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

registrations

Solve simplest haml-lint Rubocop lints (#27529)

2023-10-25 12:38:01 +00:00

sessions

Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream

2023-10-17 20:59:18 +02:00

setup

Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream

2023-08-12 09:36:38 +02:00

shared

Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)

2023-10-25 21:33:44 +00:00