Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored cbcc192036aM
Merge branches 'develop' and 'feature/SHRINE-3355-create-a-specialized-execution' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3355-create-a-specialized-execution # Conflicts: # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala
Showing diff tob3541af371a