diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-03 11:34:13 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-03 11:34:13 +0200 |
| commit | 548c91e3c58d03d1e99c7945d14afe4abd605217 (patch) | |
| tree | 6297684ea014e215b4dcb27478f8c9d9f3620835 /.gitattributes | |
| parent | 22ff009a54b281f8db2fd28530b84ebf53bf9de6 (diff) | |
| parent | 2a78e03ad54baf78b10fb3297cf0f38d78b87aa8 (diff) | |
| download | gitlab-ce-548c91e3c58d03d1e99c7945d14afe4abd605217.tar.gz | |
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# lib/gitlab/import_export/command_line_util.rb
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions