Homec4science

Merge branch 'release/1.21.0' into develop

Authored by David Walend <david_walend@hms.harvard.edu> on May 10 2016, 21:32.

Description

Merge branch 'release/1.21.0' into develop

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:117a696a7ec9: Merge branch 'release/1.21.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).May 10 2016, 21:32

Merged Changes

CommitAuthorDetailsCommitted
25e100e900eeDavid Walend
Revert "Pulled a lot of the adapter init into AdapterComponents.apply() for… 
May 10 2016
f66199c37bbeDavid Walend
Pulled a lot of the adapter init into AdapterComponents.apply() for SHRINE-1041 
May 10 2016
f04178162d53Keith Dwyer
[Webclient] Merge in dev-shrine-webclient v1.7.07-SHRINE-4 
May 10 2016
ac5958d42f24David Walend
Moved inner classes out to fix URL for SHRINE-1491 
May 9 2016
c46ed1838f17Keith Dwyer
[shrine-webclient] merging 3rd set of changes from Nich 
Apr 28 2016