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`.
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
.logo-container
|
||||
%h1
|
||||
= link_to root_path do
|
||||
= svg_logo_full
|
||||
= logo_as_symbol(:wordmark)
|
||||
|
||||
.form-container
|
||||
= render 'flashes'
|
||||
|
Reference in New Issue
Block a user