Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 02d0efa8161M
Merge branches '2.0-webclient' and 'feature/SHRINE2020-27-create-the-ability-for-a-user' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-27-create-the-ability-for-a-user # Conflicts: # frontend/shrine-webclient/v2/src/components/QueryContainer/QueryContainer.scss
Showing diff to3dbc4fb3a32