mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-30 11:33:06 -05:00
3d033a4687
Conflicts: Gemfile config/locales/simple_form.pl.yml