mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 07:38:42 +00:00
dbe311f0e9
Conflicts: - config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |