diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
| commit | 2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160 (patch) | |
| tree | d5bf8318dc82d96cd34b83481e1cc5c8289d170a /web/sass-files/sass/styles.scss | |
| parent | 9e04909c0a3672d27c148c931d82b225cc86dfe5 (diff) | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| download | chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.gz chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.bz2 chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.zip | |
Merge branch 'master' into PLT-11-email
Diffstat (limited to 'web/sass-files/sass/styles.scss')
| -rw-r--r-- | web/sass-files/sass/styles.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index de1db57e8..923a6e99b 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -10,6 +10,7 @@ @import "partials/perfect-scrollbar"; @import "partials/font-awesome"; @import "partials/base"; +@import "partials/colorpicker"; // Channel Css @import "partials/headers"; |