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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
_mixins.scss	…
about.scss	Remove duplicate CSS properties (#16278)	4 years ago
accessibility.scss	…
accounts.scss	…
admin.scss	…
basics.scss	…
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	3 years ago
compact_header.scss	…
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
containers.scss	…
dashboard.scss	…
emoji_picker.scss	Add assets from Twemoji 13.1.0 (#16345)	4 years ago
footer.scss	…
forms.scss	Add authentication history (#16408)	3 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	…
reset.scss	…
rtl.scss	…
statuses.scss	…
tables.scss	…
variables.scss	…
widgets.scss	Fix deprecated slash as division in SASS files (#16347)	4 years ago