Learn more about cloning repositories
You have read-only access
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-866 # Conflicts: # qep/frontend/src/pages/Login/login.scss