mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 11:38:07 +01:00
e2a2bc9021
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. |
||
|---|---|---|
| .. | ||
| _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 | ||