Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
_domain_blocks.html.haml	Add option to obfuscate domain name in public list of domain blocks (#15355)	2020-12-18 08:30:41 +01:00
_logged_in.html.haml	Redesign /about when already logged in (#17348)	2022-03-03 16:14:44 +01:00
_login.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2022-01-23 15:52:58 +01:00
_registration.html.haml	Change autocomplete type of password input box (#17702)	2022-03-05 05:57:50 +01:00
more.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
show.html.haml	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00