Homec4science

Merge branch 'release/1.21.0' into develop

Authored by David Walend <david_walend@hms.harvard.edu> on Mar 22 2016, 14:25.

Description

Merge branch 'release/1.21.0' into develop

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:b44ba66753e1: Merge branch 'release/1.21.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Mar 22 2016, 14:25

Merged Changes

CommitAuthorDetailsCommitted
6876058f4207David Walend
Attempted fix of SHRINE-1383 . Adding a field to the wierdly limited shrine… 
Mar 21 2016
a150561c40c7David Walend
Attempt to fix SHRINE-1383 , use the networkStatusQuery term from the config… 
Mar 21 2016
e6a987d5692aDavid Walend
Fix for SHRINE-1366 . Allow access to the happy service from anywhere. 
Mar 21 2016