mirror of https://github.com/glitch-soc/mastodon
29124990a2
Conflicts: - `app/helpers/application_helper.rb`: Upstream reworked how CSS classes for the document's body are computed. Slight conflict due to glitch-soc's different theming system. Updated as upstream did. |
||
---|---|---|
.. | ||
credentials_spec.rb | ||
familiar_followers_spec.rb | ||
featured_tags_spec.rb | ||
follower_accounts_spec.rb | ||
following_accounts_spec.rb | ||
identity_proofs_spec.rb | ||
lists_spec.rb | ||
lookup_spec.rb | ||
notes_spec.rb | ||
pins_spec.rb | ||
relationships_spec.rb | ||
search_spec.rb | ||
statuses_spec.rb |