fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
|---|---|---|
| .. | ||
| admin | ||
| apps | ||
| emails | ||
| instances | ||
| statuses | ||
| timelines | ||
| accounts_show_spec.rb | ||
| apps_spec.rb | ||
| bookmarks_spec.rb | ||
| domain_blocks_spec.rb | ||
| featured_tags_spec.rb | ||
| follow_requests_spec.rb | ||
| lists_spec.rb | ||
| mutes_spec.rb | ||
| polls_spec.rb | ||
| profiles_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||