Files
Mastodon/app/javascript/mastodon/locales
Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
..
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00