diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:46:20 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:46:20 -0500 |
commit | 19b135ec55e040c78009400f389d19ae58cc628c (patch) | |
tree | 6494c92a75f7c28f64bee81f2ed9a4eca8b7c28f /app/models/user.rb | |
parent | 6d48e4641520ce03796e5b9edd258f704cee3e82 (diff) | |
parent | 6b27e11f1613967d2b97b0eead6cf06263e6140b (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions