mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 21:33:21 +00:00
3869daef09
Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did. |
||
---|---|---|
.. | ||
credentials_controller.rb | ||
familiar_followers_controller.rb | ||
featured_tags_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
identity_proofs_controller.rb | ||
lists_controller.rb | ||
lookup_controller.rb | ||
notes_controller.rb | ||
pins_controller.rb | ||
relationships_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb |