James Lopez 834c953750 fix merge conflicts

2016-05-16 11:22:59 +02:00

..

import_export_reader_spec.rb

some changes based on MR feedback

2016-05-16 10:13:00 +02:00

members_mapper_spec.rb

fixed leaving comments on notes about missing authors

2016-05-13 16:25:27 +02:00

project_tree_restorer_spec.rb

fix spec

2016-05-13 20:58:27 +02:00

project_tree_saver_spec.rb

add author on notes to export - so we can add to a note if project member is not found

2016-05-12 14:27:41 +02:00

project.json

update json and fix notes issue

2016-05-13 14:17:10 +02:00

repo_bundler_spec.rb

fixed and refactored a few things based on MR feedback

2016-05-06 13:40:02 +02:00

wiki_repo_bundler_spec.rb

fixed and refactored a few things based on MR feedback

2016-05-06 13:40:02 +02:00