Merge remote-tracking branch 'origin/master' into 113524121-legal_doc_min_size

# Conflicts:
#	public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json
#	public/assets/registrant-manifest.js
#	public/assets/registrar-manifest.css
#	public/assets/registrar-manifest.js
#	public/assets/registrar/application.js
This commit is contained in:
Vladimir Krylov 2016-03-16 15:09:35 +02:00
commit 0a5428f2ee
259 changed files with 2592 additions and 426072 deletions

View file

@ -175,6 +175,8 @@ class Epp::Contact < Contact
else
throw :epp_error, {code: '2306', msg: I18n.t(:ident_update_error)}
end
else
throw :epp_error, {code: '2306', msg: I18n.t(:ident_update_error)}
end
end