diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
| commit | cd0c59ae6177b8b93971735887657314b6888a3c (patch) | |
| tree | d39b06cd424e3345a3cba97f56a44c920c06ec97 /users/app/models/user.rb | |
| parent | be2d8fbd65f4ed2e1e97b19a3322da20e2fb4eda (diff) | |
| parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
Merge branch 'master' into feature/removing-email-aliases
Diffstat (limited to 'users/app/models/user.rb')
0 files changed, 0 insertions, 0 deletions