diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-22 19:50:11 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-22 19:50:11 +0100 |
| commit | 5ac380c1226a8225a84835f6c70b7bdf00f99fb2 (patch) | |
| tree | 432e2dce315060938ecc0ba05a9ae20fdb1da2d7 /app/controllers/instance_actors_controller.rb | |
| parent | 02ac94490a67659c7cc669ead5b107b724db6e68 (diff) | |
| parent | 2626097869c9520c21aaba73c9bcfe72c0f25f28 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
Diffstat (limited to 'app/controllers/instance_actors_controller.rb')
0 files changed, 0 insertions, 0 deletions