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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		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
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	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	Move more tasks to tootctl (#8675)	6 years ago