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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	…
fixtures	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	…
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…