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 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		7 years ago
..
_mixins.scss	…
about.scss	Fix color of /about/more link anchors (#7618)	7 years ago
accounts.scss	Fix lock icon position in account card (#7630)	7 years ago
admin.scss	…
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
containers.scss	…
emoji_picker.scss	…
footer.scss	In footer, replace text "Mastodon" with logo (#7545)	7 years ago
forms.scss	…
landing_strip.scss	…
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	Fix color mistakes in mastodon-light theme (#7626)	7 years ago