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
..
core	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +02:00
flavours	Fix publish buttons styling	2022-02-23 22:04:12 +01:00
fonts	…
images	…
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
skins	…
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00