Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.		2020-04-12 16:50:27 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-12 16:50:27 +02:00
paperclip	Fix trying to delete already deleted file when post-processing (#13406)	2020-04-06 14:11:22 +02: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