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 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		2022-07-05 09:33:44 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
flavours	[Glitch] Add notifications for new reports	2022-06-28 13:13:10 +02:00
fonts	…
icons	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
skins	…
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00