Glitch-Shrike/app/javascript/styles/mastodon
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
..
_mixins.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
about.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
accessibility.scss
accounts.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
admin.scss Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
basics.scss
boost.scss
compact_header.scss
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
containers.scss
dashboard.scss
emoji_picker.scss
footer.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
forms.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
introduction.scss
lists.scss
modal.scss
polls.scss
reset.scss
rtl.scss
statuses.scss
tables.scss
variables.scss
widgets.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00