mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
6f75a9001f
Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml |
||
---|---|---|
.. | ||
account_finder_concern_spec.rb | ||
account_interactions_spec.rb | ||
remotable_spec.rb | ||
status_threading_concern_spec.rb | ||
streamable_spec.rb |