mastodon/app/views
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
2023-10-24 18:41:20 +02:00
..
about
accounts
admin Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 2023-10-24 18:41:20 +02:00
admin_mailer Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
application
auth Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 2023-10-17 20:59:18 +02:00
custom_css
disputes/strikes Extract `card` partial from `disputes/strikes/show` view (#27426) 2023-10-16 16:04:29 +02:00
errors
filters
follower_accounts
following_accounts
home
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
kaminari
layouts
mail_subscriptions
media
notification_mailer Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
oauth
privacy
relationships Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 2023-10-17 20:59:18 +02:00
remote_interaction_helper
settings Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
shared Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
shares
statuses Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02:00
statuses_cleanup
tags
user_mailer Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
well_known/host_meta