mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
8743b1ea40
Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. |
||
---|---|---|
.. | ||
_mixins.scss | ||
about.scss | ||
accessibility.scss | ||
accounts.scss | ||
admin.scss | ||
basics.scss | ||
boost.scss | ||
compact_header.scss | ||
components.scss | ||
containers.scss | ||
dashboard.scss | ||
emoji_picker.scss | ||
footer.scss | ||
forms.scss | ||
introduction.scss | ||
lists.scss | ||
modal.scss | ||
polls.scss | ||
reset.scss | ||
rtl.scss | ||
statuses.scss | ||
tables.scss | ||
variables.scss | ||
widgets.scss |