Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.
This commit is contained in:
commit
34c9f77b3e
66 files changed
+928
-1830
No files matched your search
@@ -0,0 +1,8 @@
|
||||
@font-face {
|
||||
font-family: Inter;
|
||||
src: url('../fonts/inter/inter-variable-font-slnt-wght.woff2')
|
||||
format('woff2-variations');
|
||||
font-weight: 100 900;
|
||||
font-style: normal;
|
||||
mso-generic-font-family: swiss; /* stylelint-disable-line property-no-unknown -- Proprietary property for Outlook on Windows. */
|
||||
}
|
||||
+438
-478
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user