mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 23:01:36 +01:00
74c5b2bd08
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) |
||
---|---|---|
.. | ||
_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 |