diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-07 17:52:51 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-07 17:52:51 +0000 |
commit | e36daa0fd95c93967708447b3b8f615c2a81e3b5 (patch) | |
tree | 4725efc3c18bc321da6941dcf274b4396c2782c6 /.scss-lint.yml | |
parent | 2719b2f0a1ed03170abeca7e78d99a36afb0b65d (diff) | |
parent | 7c35ecf7e44e5b44643b41719a67e89f99f10053 (diff) | |
download | gitlab-ce-e36daa0fd95c93967708447b3b8f615c2a81e3b5.tar.gz |
Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'
# Conflicts:
# app/models/concerns/each_batch.rb
# spec/models/concerns/each_batch_spec.rb
Diffstat (limited to '.scss-lint.yml')
0 files changed, 0 insertions, 0 deletions