diff options
author | jessib <jessib@leap.se> | 2013-02-26 13:25:25 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-02-26 13:25:25 -0800 |
commit | c97f356ae8ce07dab04b81d0d0160f3e5fd96f6d (patch) | |
tree | 73e5d68347d5aa839b3b63eaf3eefcc49e4d937d /users/app/models/user.rb | |
parent | a7722e57ee6e10b578457e880f04349f7f9a0f66 (diff) | |
parent | 97fe2b4d19edacf2ea67c7efcfbec50feca305b0 (diff) |
Merge branch 'master' into feature/limit_usernames
Diffstat (limited to 'users/app/models/user.rb')
0 files changed, 0 insertions, 0 deletions