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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		6 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)	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Merge branch 'master' 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	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago