Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.

2024-05-14 20:47:14 +02:00

..

development.rb

Update devise-two-factor to version 5.0.0 (#28325)

2024-05-02 09:31:41 +00:00

production.rb

Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream

2024-05-14 20:47:14 +02:00

test.rb

Update devise-two-factor to version 5.0.0 (#28325)

2024-05-02 09:31:41 +00:00