Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Added File object to schema
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Add Project as valid File parent
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/xschildw/Synapse-Repository-Services into develop
setup basic project
more upload testing
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/xschildw/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/xschildw/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/xschildw/Synapse-Repository-Services into develop
making more progress
fixed merged conflict