Merging
Merging
merging
Settling Submissions view
Settling Submissions view
merging to get updates
resolving problems
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
resolving problems
resolving merge conflicts
Merge pull request #32 from JParker85/release-1

Fixing Errors with database interface