diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 09:29:23 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 09:29:23 +0100 |
| commit | be493b6c0d60778257cbd6247f9287f939fc7e4e (patch) | |
| tree | 07c127fc0e059ccd185c40a3c4497706f3bcacc7 /public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | a5c24d5c4d75f3f3144f69c8f60f542707a82584 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.
Diffstat (limited to 'public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg')
0 files changed, 0 insertions, 0 deletions