diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-16 11:24:55 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-06-16 11:24:55 +0200 |
| commit | 4aa78027ea747bb932645df31c831d632044e200 (patch) | |
| tree | 9d937d5c21246c32ef80178ae637632e840bed38 /app/views/settings/profiles | |
| parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) | |
| parent | 8428faa0859d86c97950084658498a2c25e26f15 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: upstream-updated dependency (redis) textually too close to glitch-specific one (redcarpet). Ported upstream change.
Diffstat (limited to 'app/views/settings/profiles')
0 files changed, 0 insertions, 0 deletions