diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
| commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
| tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /spec/support/gitlab-git-test.git/packed-refs | |
| parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-fix-btn-alignment.tar.gz | |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'spec/support/gitlab-git-test.git/packed-refs')
| -rw-r--r-- | spec/support/gitlab-git-test.git/packed-refs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/gitlab-git-test.git/packed-refs b/spec/support/gitlab-git-test.git/packed-refs index ce5ab1f705b..507e4ce785a 100644 --- a/spec/support/gitlab-git-test.git/packed-refs +++ b/spec/support/gitlab-git-test.git/packed-refs @@ -8,6 +8,7 @@ 46e1395e609395de004cacd4b142865ab0e52a29 refs/heads/gitattributes-updated 4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/master 5937ac0a7beb003549fc5fd26fc247adbce4a52e refs/heads/merge-test +9596bc54a6f0c0c98248fe97077eb5ccf48a98d0 refs/heads/missing-gitmodules f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 refs/tags/v1.0.0 ^6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b refs/tags/v1.1.0 |