Files
Mastodon/app/javascript/mastodon/locales
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
2018-09-09 10:38:13 +09:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00