You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		6 years ago
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	6 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	6 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
cli.rb	Add CLI task for rotating keys (#8466)	6 years ago