diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-20 12:17:14 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-04-20 12:17:14 +0200 |
| commit | e2a2bc90213a653b772b457499cedbfe2e830d74 (patch) | |
| tree | c97643e3977ce9110fdf081ed3f3a70ae1a4457f /public/emoji/1f468-1f3fb-200d-1f4bc.svg | |
| parent | df326b8b5c0659edb2aca77690a892f228b0e099 (diff) | |
| parent | b5ac17c4b6bfa85494fd768bbf1af87ca79b622b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.
Diffstat (limited to 'public/emoji/1f468-1f3fb-200d-1f4bc.svg')
0 files changed, 0 insertions, 0 deletions