diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-14 22:34:09 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-14 22:34:09 +0100 |
| commit | ab59743c131574076af7fa3640493a866c4528ad (patch) | |
| tree | c06274b2eaaf6fdb6d1ffb8c2d0ff6b94befdf6b /app/services/base_service.rb | |
| parent | afd0d424da4928b9e20a3c7a943f970252ed3a29 (diff) | |
| parent | d66dfc7b3c1b62a0d5276387ea8745da598afacc (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
Diffstat (limited to 'app/services/base_service.rb')
0 files changed, 0 insertions, 0 deletions