diff options
author | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
commit | 67f59ebd50511bfba1ebdc73b6fd269f425ac6f0 (patch) | |
tree | 635c708678523ca5149880c1bea6dd8fa73c0a0f /doc/workflow/rebase.png | |
parent | 545b92af067832d560846b7ec7cb26caf3302275 (diff) | |
parent | 1a68a0a6f55049b4ad42222b0dc667fe625a7604 (diff) | |
download | gitlab-ce-67f59ebd50511bfba1ebdc73b6fd269f425ac6f0.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'doc/workflow/rebase.png')
-rw-r--r-- | doc/workflow/rebase.png | bin | 123041 -> 68976 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/workflow/rebase.png b/doc/workflow/rebase.png Binary files differindex ef82c834755..df353311fa0 100644 --- a/doc/workflow/rebase.png +++ b/doc/workflow/rebase.png |