diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 16:28:17 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 16:28:17 +0100 |
| commit | c89ccbab09696dc4d1de486417cccfd2ad5f30a0 (patch) | |
| tree | 01800951927df483f35236d7e252ca7ca0b8b2ee /app/models/user.rb | |
| parent | 88f32708c3801c5be413641be092db6fcbe5b013 (diff) | |
| parent | 22e06a4077bef6317e72385a05052105f3804d68 (diff) | |
Merge branch 'master' into feature-omnisearch
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions