diff options
| author | Peter Kozak <spag@golwen.net> | 2013-06-27 08:56:03 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-06-27 08:56:03 +0200 |
| commit | 39c06e5b4fd5a984c4f93fa48567c63848632ced (patch) | |
| tree | 393ec0dbe1020d6800c94476f6c331d211ab9c30 /app/models/user.rb | |
| parent | 677e234c6b3bbec189f2caf2f237f609ab44b274 (diff) | |
| parent | 1c6646bc732def369e54ef4ac576d748c6ba9c92 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions