diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-26 11:45:23 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-26 11:45:23 +0300 |
| commit | 272d482f17c3bc97b1ae54be5e545389ba4246dc (patch) | |
| tree | 3074be7369a96b266b5e4ff3426114107948ee11 /app/assets/stylesheets/application.scss | |
| parent | 0378c5b8792cdfc973df932eb64d1a2d685c8792 (diff) | |
| parent | adc64e4583dc42399f681a9b17490f98b8c4bec0 (diff) | |
| download | gitlab-ce-272d482f17c3bc97b1ae54be5e545389ba4246dc.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapsesidebar-expand-collapse
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 1 |
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 */ |