mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 22:55:07 +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 |
||
---|---|---|
.. | ||
_mixins.scss | ||
about.scss | ||
accounts.scss | ||
admin.scss | ||
basics.scss | ||
boost.scss | ||
compact_header.scss | ||
components.scss | ||
containers.scss | ||
emoji_picker.scss | ||
footer.scss | ||
forms.scss | ||
landing_strip.scss | ||
lists.scss | ||
modal.scss | ||
reset.scss | ||
rtl.scss | ||
stream_entries.scss | ||
tables.scss | ||
variables.scss |