mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
53b7bb9d04
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |