Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.		2020-04-05 18:32:06 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-05 18:32:06 +02: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