Automatic merge of gitlab-org/gitlab-ce master

dfa9e89e · GitLab Bot · 4c8d6d9a · dfd09753 · dfa9e89e
Commit dfa9e89e authored Mar 20, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +2 -0

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -406,6 +406,8 @@ img.emoji {
 .block { display: block; }
 .flex { display: flex; }
 .center { text-align: center; }
+.block { display: block; }
+.flex { display: flex; }
 .vertical-align-middle { vertical-align: middle; }
 .vertical-align-sub { vertical-align: sub; }
 .flex-align-self-center { align-self: center; }