Homec4science

Merge branch 'hotfix/1.21.1' into develop

Authored by Keith Dwyer <keith_dwyer@hms.harvard.edu> on May 18 2016, 22:42.

Description

Merge branch 'hotfix/1.21.1' into develop

Event Timeline

Keith Dwyer <keith_dwyer@hms.harvard.edu> committed R2664:463c3fc6ef81: Merge branch 'hotfix/1.21.1' into develop (authored by Keith Dwyer <keith_dwyer@hms.harvard.edu>).May 18 2016, 22:42

Merged Changes

CommitAuthorDetailsCommitted
f6ce94b4b41aKeith Dwyer
[webclient] revert default urlProxy to shrine-proxy 
May 18 2016
edcaf82f9e27Catalyst Bamboo
Merge release branch release/1.21.0 into master. 
May 17 2016
6779dd2d3eb1Catalyst Bamboo
Update POMs with release version 1.21.0. 
May 17 2016