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.

Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		4 years ago
..
_mixins.scss	…
about.scss	Fix styling issue on /about when server admin has a long username (#15357)	4 years ago
accessibility.scss	…
accounts.scss	…
admin.scss	…
basics.scss	…
boost.scss	Change media modals look in web UI (#15217)	4 years ago
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
containers.scss	Fix logo button style more (#15458)	4 years ago
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	Add ability to require invite request text (#15326)	4 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	…
reset.scss	…
rtl.scss	Fix logo button style (#15428)	4 years ago
statuses.scss	Fix logo button style more (#15458)	4 years ago
tables.scss	…
variables.scss	Add interrelationship icon (#15149)	4 years ago
widgets.scss	Add interrelationship icon (#15149)	4 years ago