mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
92c06a1113
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. |
||
---|---|---|
.. | ||
admin | ||
keys | ||
trends | ||
v1 | ||
account_serializer.rb | ||
announcement_serializer.rb | ||
application_serializer.rb | ||
context_serializer.rb | ||
conversation_serializer.rb | ||
credential_account_serializer.rb | ||
custom_emoji_serializer.rb | ||
encrypted_message_serializer.rb | ||
familiar_followers_serializer.rb | ||
featured_tag_serializer.rb | ||
filter_keyword_serializer.rb | ||
filter_result_serializer.rb | ||
filter_serializer.rb | ||
instance_serializer.rb | ||
list_serializer.rb | ||
marker_serializer.rb | ||
media_attachment_serializer.rb | ||
mute_serializer.rb | ||
muted_account_serializer.rb | ||
notification_serializer.rb | ||
poll_serializer.rb | ||
preferences_serializer.rb | ||
preview_card_serializer.rb | ||
reaction_serializer.rb | ||
relationship_serializer.rb | ||
report_serializer.rb | ||
role_serializer.rb | ||
rule_serializer.rb | ||
scheduled_status_serializer.rb | ||
search_serializer.rb | ||
status_edit_serializer.rb | ||
status_serializer.rb | ||
status_source_serializer.rb | ||
suggestion_serializer.rb | ||
tag_serializer.rb | ||
web_push_subscription_serializer.rb |