Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
paperclip	…
tasks	…
templates	…
cli.rb	Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)	2019-03-11 13:45:17 +01:00