summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/application.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/assets/stylesheets/application.scss
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9ef1b58ed24..40228b93e01 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -24,6 +24,9 @@
// EE-only stylesheets
@import 'application_ee';
+// JH-only stylesheets
+@import 'application_jh';
+
/* print styles */
@media print {
@import 'print';