diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 20:41:02 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 20:41:02 +0000 |
| commit | 6886fab4aa7f6ddba27f1d7df591b1a6bfc27044 (patch) | |
| tree | 99ba9f7e677a31b112028c40f01af95b4a6b3353 /app/assets/stylesheets/framework.scss | |
| parent | bdd1193f57a2e2e9c38f5f267179bd62a876f030 (diff) | |
| parent | 50c38980319bf8e540213ef85ec92ecf14c6ed50 (diff) | |
| download | gitlab-ce-6886fab4aa7f6ddba27f1d7df591b1a6bfc27044.tar.gz | |
Merge branch 'master' into 'remove-pages-css'remove-pages-css
# Conflicts:
# app/assets/stylesheets/framework.scss
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 c0ddaacd558..4d4835568ed 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -42,3 +42,4 @@ @import "framework/page-header.scss"; @import "framework/awards.scss"; @import "framework/images.scss"; +@import "framework/broadcast-messages"; |