diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-05 15:50:54 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-05 15:50:54 +0500 |
| commit | 022317823e6c2b5a1787854d5531e7c32881b9a6 (patch) | |
| tree | 9b3f41517a89bf7c6f555ba635ccf8f0f2b60edb /web/sass-files/sass/styles.scss | |
| parent | 2d5a181c7d64097df8014a8290be40cddb81ab16 (diff) | |
| parent | ea51edf0c4a2c62ba3f6585dfde93c240c8f0a4b (diff) | |
| download | chat-022317823e6c2b5a1787854d5531e7c32881b9a6.tar.gz chat-022317823e6c2b5a1787854d5531e7c32881b9a6.tar.bz2 chat-022317823e6c2b5a1787854d5531e7c32881b9a6.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Conflicts:
web/react/components/mention_list.jsx
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 ffd1f42b8..eb5152a2c 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -33,6 +33,7 @@ @import "partials/error"; @import "partials/error-bar"; @import "partials/loading"; +@import "partials/get-link"; // Responsive Css @import "partials/responsive"; |