You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jeremy Kescher 03f50f2f00 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png		2 years ago
..
components	Change glitch-soc composer classes to match upstream	2 years ago
contrast	[Glitch] Fix wrong colors in the high-contrast theme	2 years ago
mastodon-light	[Glitch] Fix colors in light theme	2 years ago
_mixins.scss	…
about.scss	[Glitch] Change about page to be mounted in the web UI	2 years ago
accessibility.scss	Change glitch-soc composer classes to match upstream	2 years ago
accounts.scss	…
admin.scss	[Glitch] Fix sidebar and tabs on settings on small screens in admin UI	2 years ago
basics.scss	…
branding.scss	…
containers.scss	Change glitch-soc composer classes to match upstream	2 years ago
contrast.scss	…
dashboard.scss	[Glitch] Change about page to be mounted in the web UI	2 years ago
forms.scss	[Glitch] Change admin announcement edition interface to use datetime-local	2 years ago
index.scss	[Glitch] Change public accounts pages to mount the web UI	2 years ago
lists.scss	…
mastodon-light.scss	…
modal.scss	…
oatstodon.scss	…
polls.scss	…
reset.scss	…
rtl.scss	Change glitch-soc composer classes to match upstream	2 years ago
statuses.scss	[Glitch] Change public accounts pages to mount the web UI	2 years ago
tables.scss	…
variables.scss	…
widgets.scss	[Glitch] Change about page to be mounted in the web UI	2 years ago