diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-13 10:36:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 10:36:04 +0200 |
| commit | 800e87ae9133c748606d2461613d85597033fea2 (patch) | |
| tree | 8ed50e08f3de377e7b1e264a3029f52f56d3d58e /app/javascript/styles/application.scss | |
| parent | 970f06331bc7e482226e974c468b559a9e2f3fa3 (diff) | |
| parent | f938afee7229d7218559069c3dd968f131b6219c (diff) | |
Merge pull request #1798 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles/application.scss')
| -rw-r--r-- | app/javascript/styles/application.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index cb65b9567..bbea06195 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,6 +6,7 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; +@import 'mastodon/branding'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; |