395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| about.scss | ||
| accessibility.scss | ||
| accounts.scss | ||
| admin.scss | ||
| basics.scss | ||
| branding.scss | ||
| components.scss | ||
| containers.scss | ||
| dashboard.scss | ||
| emoji_picker.scss | ||
| forms.scss | ||
| lists.scss | ||
| modal.scss | ||
| polls.scss | ||
| reset.scss | ||
| rich_text.scss | ||
| rtl.scss | ||
| statuses.scss | ||
| tables.scss | ||
| variables.scss | ||
| widgets.scss | ||