Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
paperclip	…
tasks	…
templates	…
cli.rb	Add `tootctl self-destruct` (#10367)	2019-03-28 17:56:25 +01:00