diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-28 06:51:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-28 06:51:07 +0100 |
| commit | 2b94b16ee1201d15b3b9d66e142df311141a47db (patch) | |
| tree | 70ea5177c88e06ca4b8ae02ed2b9fc8685e73ffd /app/models/user.rb | |
| parent | 5c87034a0448af2e2bd3f4de3bbaba4d482d1f7e (diff) | |
| parent | e78e21860788ed7faabe25d645f58cd0c153dfac (diff) | |
Merge branch 'develop'5.1.0
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions