Merge branch 'master' into production

This commit is contained in:
Michael Schmatz 2014-07-07 20:06:07 -07:00
commit 62badeb9d6

View file

@ -134,7 +134,7 @@ UserSchema = c.object {},
schoolFilter:
title: 'School'
type: 'string'
enum: ['Top 20 Eng.', 'Other US', 'Other Intl.']
enum: ['Top 20 Eng.', 'Other US', 'Other Intl.','Top School', 'Other']
locationFilter:
title: 'Location'
type: 'string'