diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-29 12:04:45 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-29 12:04:45 -0500 |
| commit | 4f529a88065b39a488814a87b08086be54a2037c (patch) | |
| tree | ea6b59775427f5cd41adf825ed6103170a97bd41 /app/assets/stylesheets/framework.scss | |
| parent | 45c29fa289bc27519a2fa076a155186d3ebf7b31 (diff) | |
| parent | eb9838d38bb38462b3f3f120c353817a4a09f6d6 (diff) | |
| download | gitlab-ce-4f529a88065b39a488814a87b08086be54a2037c.tar.gz | |
Merge branch 'master' into issue_13212issue_13212
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index fa7641b1676..e2a30f5ed34 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -26,6 +26,7 @@ @import "framework/mobile.scss"; @import "framework/nav.scss"; @import "framework/pagination.scss"; +@import "framework/progress.scss"; @import "framework/panels.scss"; @import "framework/selects.scss"; @import "framework/sidebar.scss"; |