Merge branch 'master' into 2681-new-inactive-user-notification
authorWard Vandewege <ward@curoverse.com>
Thu, 29 May 2014 00:29:12 +0000 (20:29 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 29 May 2014 00:29:12 +0000 (20:29 -0400)
commitebb166d65eb37f89edeccfc5be97014f3f2a73e2
tree5189806b5b41d64ba6159f3a3714b6c6e9e84901
parent1eee45ce0bbae9e7d04a9382469d2c48fb0cfd3e
parent40b6a69496aa50349d07daa6b28ae36bddd8a6a4
Merge branch 'master' into 2681-new-inactive-user-notification
services/api/app/models/user.rb
services/api/config/application.default.yml