Thibaut Girka 3788f37c30 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.		2020-03-27 21:54:44 +01:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-27 21:54:44 +01:00
paperclip	Fix Paperclip using deprecated URI.escape function (#13320)	2020-03-26 15:09:16 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-29 12:20:54 +01:00
templates
cli.rb	Close registration before self-destruct (#12877)	2020-01-21 18:56:18 +01:00