mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 07:34:58 +01:00
c816701550
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml |
||
|---|---|---|
| .. | ||
| accounts | ||
| apps | ||
| lists | ||
| statuses | ||
| timelines | ||
| accounts_controller_spec.rb | ||
| apps_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| bookmarks_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| follow_requests_controller_spec.rb | ||
| follows_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| media_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||