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 f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
accessibility.scss	…
accounts.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
containers.scss	Fix counter sizing (#12446)	5 years ago
dashboard.scss	…
emoji_picker.scss	…
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	Improve polls: option lengths & redesign (#13257)	5 years ago
reset.scss	…
rtl.scss	…
statuses.scss	…
tables.scss	Fix batch actions being hidden from mobile view (#12183)	5 years ago
variables.scss	Add bookmarks (#7107)	5 years ago
widgets.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago