Merge branch 'master' into 2681-new-inactive-user-notification
authorWard Vandewege <ward@curoverse.com>
Fri, 30 May 2014 19:50:59 +0000 (15:50 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 30 May 2014 19:50:59 +0000 (15:50 -0400)
commit4609a76d9b84e0f63233cdf6dcbef376b1686b69
treecb66423d40665c77b3bb02ca3eba26d6c7d3979a
parent0c1c7fa2cba96aae542db0e6b6991c71d5ff578a
parentb6ea1fe3bf38bf28823c80b3aef98239a1c0311b
Merge branch 'master' into 2681-new-inactive-user-notification
services/api/app/models/user.rb