Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

Merge branches 'feature/project-export' and 'feature/project-import' of...
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
3b7e5df8 · James Lopez · ff56f7be · b2b7b38c · 3b7e5df8 · 3b7e5df8
Commit 3b7e5df8 authored May 12, 2016 by James Lopez
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lib/gitlab/import_export/error.rb lib/gitlab/import_export/error.rb +1 -1

lib/gitlab/import_export/import_export_reader.rb lib/gitlab/import_export/import_export_reader.rb +1 -1

No files found.
--- a/lib/gitlab/import_export/error.rb
+++ b/lib/gitlab/import_export/error.rb
--- a/lib/gitlab/import_export/import_export_reader.rb
+++ b/lib/gitlab/import_export/import_export_reader.rb