diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-05 22:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 22:20:58 +0100 |
| commit | 772b4ba24c60e0394d25d0fad4eefb338a9befea (patch) | |
| tree | 804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/javascript/flavours/glitch/styles/index.scss | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 866496ac16b47ee17138db600519a630be833e4e (diff) | |
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/index.scss')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/index.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss index 3cb592499..323b2e7fe 100644 --- a/app/javascript/flavours/glitch/styles/index.scss +++ b/app/javascript/flavours/glitch/styles/index.scss @@ -16,6 +16,7 @@ @import 'accounts'; @import 'stream_entries'; @import 'components/index'; +@import 'polls'; @import 'about'; @import 'tables'; @import 'admin'; |