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		2019-09-30 12:23:57 +02:00
..
_domain_blocks.html.haml	Fix public list of domain blocks being too verbose on about page (#11967)	2019-09-29 16:23:01 +02:00
_login.html.haml	Fix duplicate HTML ids in /about (#11803)	2019-09-10 20:55:23 +02:00
_registration.html.haml	Fix duplicate HTML ids in /about (#11803)	2019-09-10 20:55:23 +02:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
show.html.haml	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00