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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		5 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
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
json_ld	Preload common JSON-LD contexts (#9412)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
paperclip	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
cli.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	5 years ago