diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
| commit | ea531e1effa51bcec84e50a69901e6eec7c789c1 (patch) | |
| tree | d3c1281deea1c9b2e8596cfa79a2e9d5cd4f7a10 /app/assets/stylesheets/framework.scss | |
| parent | 4d141cb30dfcad94db89bdc08f4ea907dc2f8bdf (diff) | |
| parent | fc56d2fbaa2a317813c9dd7ba36e584162175fe6 (diff) | |
| download | gitlab-ce-ea531e1effa51bcec84e50a69901e6eec7c789c1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 5bb7e8caec1..b8ba77f4513 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -34,6 +34,7 @@ @import "framework/selects.scss"; @import "framework/sidebar.scss"; @import "framework/tables.scss"; +@import "framework/notes.scss"; @import "framework/timeline.scss"; @import "framework/typography.scss"; @import "framework/zen.scss"; @@ -47,3 +48,4 @@ @import "framework/emoji-sprites.scss"; @import "framework/icons.scss"; @import "framework/snippets.scss"; +@import "framework/memory_graph.scss"; |