diff options
author | Azul <azul@riseup.net> | 2016-07-12 17:55:00 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-07-12 17:55:00 +0200 |
commit | ef4a4ecf213c316cc979ee9e9b08e4c87fd24c06 (patch) | |
tree | c0b9660c0e41e4d9791c3939cdc070b6a15837ba /app/models/user.rb | |
parent | 077987748387a158689d471dccddcb7dda781bd4 (diff) | |
parent | 87e467530b686c41ae0b9a8fbf3ed571680bcb74 (diff) |
Merge remote-tracking branch 'pr/230' into develop
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 206c0df..704700b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,5 @@ require 'login_format_validation' +require 'local_email' class User < CouchRest::Model::Base include LoginFormatValidation |