This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire be493b6c0d 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.		2022-02-26 09:29:23 +01:00
..
contrast	…
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
mastodon-light	Fixing the hero widget (#15926)	2021-03-19 20:23:32 +01:00
application.scss	…
contrast.scss	…
mailer.scss	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
mastodon-light.scss	…
win95.scss	…