Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Description
Description
Details
Details
- Committed
David Walend <david_walend@hms.harvard.edu> Oct 13 2016, 19:20 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:ce89511ea226: Brought in the courier library for SHRINE-1702
R2664:3e4e094e8447: Merge branch 'feature/new-crypto' into develop - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3e4e094e8447 | Ty | Merge branch 'feature/new-crypto' into develop | Oct 13 2016 | |||
| a4e626ceed18 | Ty | fixed up status tests | Oct 13 2016 | |||
| b3ea22479ce2 | Ty | dug the modified date out of the class path for mappings file | Oct 13 2016 | |||
| 5e79894fc65f | Ty | Merge branch 'develop' into feature/new-crypto | Oct 12 2016 | |||
| e2e0d9be4935 | Ty | merge conflicts in problems controller | Oct 12 2016 | |||
| ef27c9e77863 | Ty | initial import of bouncy-castle/cryptacular, style changes | Oct 12 2016 |