mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 07:32:09 +00: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 |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |