Skip to content
  • James Lopez's avatar
    Merge branches 'feature/project-export-ui-experimental' and... · 15874f095d43
    James Lopez authored
    Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
    
    # Conflicts:
    #	Gemfile.lock
    #	app/helpers/todos_helper.rb
    #	app/models/todo.rb
    #	app/views/projects/edit.html.haml
    #	lib/gitlab/import_export/import_service.rb
    15874f095d43