Conflicts: - `app/models/custom_emoji.rb`: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| admin | ||
| filters | ||
| notifications | ||
| filters_spec.rb | ||
| instance_spec.rb | ||
| media_spec.rb | ||
| notifications_spec.rb | ||
| search_spec.rb | ||
| suggestions_spec.rb | ||