mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
b2915613fb
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream. |
||
---|---|---|
.. | ||
credentials_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
lists_controller_spec.rb | ||
notes_controller_spec.rb | ||
pins_controller_spec.rb | ||
relationships_controller_spec.rb | ||
search_controller_spec.rb | ||
statuses_controller_spec.rb |