e25cc4deb7
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| apps | ||
| emails | ||
| instances | ||
| lists | ||
| statuses | ||
| timelines | ||
| accounts_show_spec.rb | ||
| apps_spec.rb | ||
| blocks_spec.rb | ||
| bookmarks_spec.rb | ||
| domain_blocks_spec.rb | ||
| favourites_spec.rb | ||
| featured_tags_spec.rb | ||
| follow_requests_spec.rb | ||
| followed_tags_spec.rb | ||
| lists_spec.rb | ||
| media_spec.rb | ||
| mutes_spec.rb | ||
| notifications_spec.rb | ||
| polls_spec.rb | ||
| profiles_spec.rb | ||
| reports_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||