summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/styles.scss
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
commit3bd350dcaf65a89040f7ea395a19b620819ba03e (patch)
tree72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /web/sass-files/sass/styles.scss
parente06e292be71ca699d90bafbd635118aa47c2d7a5 (diff)
parentbfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff)
downloadchat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'web/sass-files/sass/styles.scss')
-rw-r--r--web/sass-files/sass/styles.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 422447b6e..de1db57e8 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -29,6 +29,7 @@
@import "partials/videos";
@import "partials/settings";
@import "partials/modal";
+@import "partials/forms";
@import "partials/mentions";
@import "partials/command-box";
@import "partials/error";