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/trends | ||
| announcements | ||
| featured_tags | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| announcements_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| directories_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| streaming_controller_spec.rb | ||