diff options
author | ThibG <thib@sitedethib.com> | 2018-08-01 15:29:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-01 15:29:35 +0200 |
commit | 20e75666b2c52be6bbc7fe3f6fbe4278f35dde15 (patch) | |
tree | ea47c70306d15e6b187ce0d37f9dd2936ee9b29d /app/javascript/styles/application.scss | |
parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
parent | a0d01119794655dc789eda94905304679de070e8 (diff) |
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles/application.scss')
-rw-r--r-- | app/javascript/styles/application.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index 7b3b10dfe..0990a4f25 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -10,7 +10,7 @@ @import 'mastodon/lists'; @import 'mastodon/footer'; @import 'mastodon/compact_header'; -@import 'mastodon/landing_strip'; +@import 'mastodon/widgets'; @import 'mastodon/forms'; @import 'mastodon/accounts'; @import 'mastodon/stream_entries'; |