app/assets/stylesheets/framework/variables.scss · cec602a16e2efbfc3ec4cb3227cd0f48ffb6baca · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-12 · cec602a1
GitLab Bot authored Jun 12, 2018
```
# Conflicts:
#	app/assets/stylesheets/framework/common.scss
#	app/assets/stylesheets/framework/header.scss

[ci skip]
```
cec602a1

variables.scss 18.9 KB