diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
| commit | 322e907e0417da482789e4d24263f247f29a5769 (patch) | |
| tree | 8356833bbbf82de571feb1d739e0db7e2a50c9be /app/javascript/flavours/glitch/features | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | 3aebe711fd54d75c1ea35e65a5dc342e78508d15 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.
Diffstat (limited to 'app/javascript/flavours/glitch/features')
0 files changed, 0 insertions, 0 deletions