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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
_domain_blocks.html.haml	Fix public list of domain blocks being too verbose on about page (#11967)	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
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