diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2016-12-15 16:10:04 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2016-12-15 16:10:04 +0000 |
| commit | 23f4d182e9b2fdd9cad6ebd5d898b52f671b9e66 (patch) | |
| tree | b4091286ef0f142288f7eb4e969c29bef00b8022 /app/views/ci | |
| parent | 03a95c7070938e0fde67f2def334c08cf72d9d29 (diff) | |
| parent | ada8b026ef55733a94821525249ed67a094d5521 (diff) | |
| download | gitlab-ce-23f4d182e9b2fdd9cad6ebd5d898b52f671b9e66.tar.gz | |
Merge branch 'master' into '22604-manual-actions'
# Conflicts:
# app/assets/stylesheets/pages/pipelines.scss
Diffstat (limited to 'app/views/ci')
0 files changed, 0 insertions, 0 deletions