diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
| commit | f9e2b4730f58ba630344c9554eb907ab003abbd5 (patch) | |
| tree | 8ea283d80956ce9117f40cd58469e7dc26a4bb44 /spec/features/admin/admin_settings_spec.rb | |
| parent | b49ac65e3fcfcac87157810b08d20efd8b8e5e73 (diff) | |
| parent | 5b92d405fd6e52e6bf1ab1d440ece5a5c1654198 (diff) | |
| download | gitlab-ce-f9e2b4730f58ba630344c9554eb907ab003abbd5.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/branches/_branch.html.haml
Diffstat (limited to 'spec/features/admin/admin_settings_spec.rb')
0 files changed, 0 insertions, 0 deletions