Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-12-06 11:46:45 +01:00
commit d675730cdb
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -786,6 +786,7 @@ returns
end end
def check_email def check_email
return if Setting.get('import_mode')
return if email.empty? return if email.empty?
self.email = email.downcase.strip self.email = email.downcase.strip
return if id == 1 return if id == 1