b135b6ba8f
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| apps | ||
| emails | ||
| instances | ||
| lists | ||
| statuses | ||
| timelines | ||
| accounts_spec.rb | ||
| apps_spec.rb | ||
| blocks_spec.rb | ||
| bookmarks_spec.rb | ||
| csp_spec.rb | ||
| custom_emojis_spec.rb | ||
| domain_blocks_spec.rb | ||
| endorsements_spec.rb | ||
| favourites_spec.rb | ||
| featured_tags_spec.rb | ||
| follow_requests_spec.rb | ||
| followed_tags_spec.rb | ||
| instance_spec.rb | ||
| lists_spec.rb | ||
| media_spec.rb | ||
| mutes_spec.rb | ||
| notifications_spec.rb | ||
| polls_spec.rb | ||
| preferences_spec.rb | ||
| profiles_spec.rb | ||
| reports_spec.rb | ||
| scheduled_status_spec.rb | ||
| statuses_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||