mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-13 00:45:17 +00:00
c91d9b7389
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper_spec.rb | ||
flashes_helper_spec.rb | ||
home_helper_spec.rb | ||
instance_helper_spec.rb | ||
jsonld_helper_spec.rb | ||
routing_helper_spec.rb | ||
settings_helper_spec.rb | ||
stream_entries_helper_spec.rb |