summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/application.scss
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-26 10:30:11 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-26 10:30:11 +0200
commitadc64e4583dc42399f681a9b17490f98b8c4bec0 (patch)
treea80723a31b277b83d69d96e4f00400bbcc0869a0 /app/assets/stylesheets/application.scss
parent997178220008696576ffb5cdee6cb9d0e7a44055 (diff)
parent3d009f77853261d43f1d5302d8016f4641ba5fca (diff)
downloadgitlab-ce-adc64e4583dc42399f681a9b17490f98b8c4bec0.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e2d590f4df4..8b93665d085 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -8,7 +8,6 @@
*= require select2
*= require_self
*= require dropzone/basic
- *= require cal-heatmap
*= require cropper.css
*/