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. |
||
|---|---|---|
| .. | ||
| bookmarks_spec.rb | ||
| favourited_by_accounts_spec.rb | ||
| favourites_spec.rb | ||
| histories_spec.rb | ||
| mutes_spec.rb | ||
| pins_spec.rb | ||
| reblogged_by_accounts_spec.rb | ||
| reblogs_spec.rb | ||
| sources_spec.rb | ||
| translations_spec.rb | ||