You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... 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)		5 years ago
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	…
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
basics.scss	Fix edit media modal on small screens, touch events (#11573)	5 years ago
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
containers.scss	Fix unused CSS (#11824)	5 years ago
dashboard.scss	Fix height of dashboard counters (#11736)	5 years ago
emoji_picker.scss	…
footer.scss	Fix Mastodon logo style on hover on public pages' footer (#11735)	5 years ago
forms.scss	Change account deletion page to have better explanations (#11753)	5 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	Fix display of long poll options (#11717)	5 years ago
reset.scss	…
rtl.scss	…
statuses.scss	…
tables.scss	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
variables.scss	…
widgets.scss	Add trends to public pages sidebar (#11594)	5 years ago