diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-25 23:49:17 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-25 23:50:35 +0100 |
| commit | 443ec4f8ba3d9f78acc1b89e2b29ad364cd5e956 (patch) | |
| tree | 6c83fa75cc4f699503546be0a68409fffa11080f /app/controllers/settings | |
| parent | 8c2fe2a846dd14914f7faa4bf71be21058249a93 (diff) | |
| parent | b1fd6d44901a13450d22884b02eb6e9ae4fc1248 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions