mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
f8d867bac4
Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper.rb | ||
application_helper.rb | ||
domain_control_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
webfinger_helper.rb |