diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-08-09 23:25:49 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-08-09 23:25:49 +0200 |
| commit | 8ec4be4233d2bfd9142860b25df639fc23655f0f (patch) | |
| tree | e0b7f33c4ae22827a7a56aa9cac5fabdd77ee57f /app/presenters/instance_presenter.rb | |
| parent | a61645ed30b854a1b4935026801eb5b287954095 (diff) | |
| parent | 4ac78e2a066508a54de82f1d910ef2fd36c3d106 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.
Diffstat (limited to 'app/presenters/instance_presenter.rb')
0 files changed, 0 insertions, 0 deletions