diff options
| author | Azul <azul@leap.se> | 2013-12-06 15:05:50 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-12-06 15:05:50 +0100 |
| commit | 8dd9505cfa52796d8c4aad8a8ad44e4a5e4319cb (patch) | |
| tree | 7a98379ba8718b16c2c2b3d3110fd6e7256613bc /users/app/models/user.rb | |
| parent | 8de6f143e53af5287b41913dcf3c7969f452fbc9 (diff) | |
| parent | 015ad90c98c55a078fdfe723d470ad732e807737 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/app/models/user.rb')
0 files changed, 0 insertions, 0 deletions