mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 12:47:58 +00: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. |
||
---|---|---|
.. | ||
credentials_controller.rb | ||
featured_tags_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
identity_proofs_controller.rb | ||
lists_controller.rb | ||
notes_controller.rb | ||
pins_controller.rb | ||
relationships_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb |