diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-15 08:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 08:58:12 +0100 |
| commit | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (patch) | |
| tree | 0bbd3318c61cf062f17386f4da166864c9db8138 /app/javascript/styles/application.scss | |
| parent | bb4e211c86270de6de8a78da96295208ee77dce1 (diff) | |
| parent | 7f96391eaef601ea34672551bb06915acec7e492 (diff) | |
Merge pull request #2122 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 81a040108..1b2969c23 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -23,3 +23,4 @@ @import 'mastodon/dashboard'; @import 'mastodon/rtl'; @import 'mastodon/accessibility'; +@import 'mastodon/rich_text'; |