Homec4science

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…

Authored by David Walend <david_walend@hms.harvard.edu> on Oct 13 2016, 19:20.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:703cb231f2f1: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Oct 13 2016, 19:20

Merged Changes

CommitAuthorDetailsCommitted
3e4e094e8447Ty
Merge branch 'feature/new-crypto' into develop 
Oct 13 2016
a4e626ceed18Ty
fixed up status tests 
Oct 13 2016
b3ea22479ce2Ty
dug the modified date out of the class path for mappings file 
Oct 13 2016
5e79894fc65fTy
Merge branch 'develop' into feature/new-crypto 
Oct 12 2016
e2e0d9be4935Ty
merge conflicts in problems controller 
Oct 12 2016
ef27c9e77863Ty
initial import of bouncy-castle/cryptacular, style changes 
Oct 12 2016