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. |
||
|---|---|---|
| .. | ||
| admin | ||
| filters | ||
| notifications | ||
| filters_spec.rb | ||
| instance_spec.rb | ||
| media_spec.rb | ||
| search_spec.rb | ||
| suggestions_spec.rb | ||