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
..
_login.html.haml	Fix duplicate HTML ids in /about (#11803)	5 years ago
_registration.html.haml	Fix duplicate HTML ids in /about (#11803)	5 years ago
blocks.html.haml	Add public blocks to /about/blocks (#11298)	5 years ago
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
show.html.haml	Change full logo to use primary text color of the given theme (#10994)	6 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago