summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-20 15:06:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-20 15:06:12 +0000
commit434a995573f6e5cad4e4742af8d1d83d719f39ca (patch)
treeda6dde462c04e1e9d2ca2d41eb07e142c38c1b4d /app/assets/stylesheets/framework.scss
parentd46287cc16ba244720c6d5c00491944336972988 (diff)
downloadgitlab-ce-434a995573f6e5cad4e4742af8d1d83d719f39ca.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
-rw-r--r--app/assets/stylesheets/framework.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index c4a0ed63080..56a88ca44db 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -68,3 +68,4 @@
@import 'framework/flex_grid';
@import 'framework/system_messages';
@import "framework/spinner";
+@import 'framework/card';