diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
| commit | fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee (patch) | |
| tree | 96aad0a31543fa520626dc1c5efabff1367a0bab /app/assets/stylesheets/application.scss | |
| parent | 9c71bf3e6df2dcb20ea19df21a127823bbe5e615 (diff) | |
| parent | fa216b0e86433192ba4e39a05f42217fb4685173 (diff) | |
| download | gitlab-ce-fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into alerts-dropdown-to-modal-part-2-cealerts-dropdown-to-modal-part-2-ce
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 fbf16aa324a..e98030f1511 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,7 +12,6 @@ // If you need to add unique style that should affect only one page - use pages/ // directory. @import "at.js/dist/css/jquery.atwho"; -@import "pikaday/scss/pikaday"; @import "dropzone/dist/basic"; @import "select2/select2"; |