You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	…
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…