diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:13:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 18:24:01 +0100 |
| commit | 61ef81c548a0140a80281d4004ac55873d8f74d6 (patch) | |
| tree | 770c251059d139243b9cb557c762648e0af55037 /app/views/user_mailer | |
| parent | 4d0383d75ac606f8c9c2b8ecb0ea2dddf28213cb (diff) | |
| parent | 0a120d86d28e3f2e20455f56c1656f5d5f2f4af6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.
Diffstat (limited to 'app/views/user_mailer')
0 files changed, 0 insertions, 0 deletions