mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 09:07:01 +00:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| apps | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller_spec.rb | ||
| apps_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| bookmarks_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| follow_requests_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| media_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| polls_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||
| suggestions_controller_spec.rb | ||