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

This commit is contained in:
Martin Edenhofer 2017-11-02 09:15:10 +01:00
commit 5f088cf8f2

View file

@ -262,7 +262,7 @@ class ConnectionWizard extends App.WizardModal
success: (data, status, xhr) =>
if data.result isnt 'ok'
if data.message.indexOf('certificate verify failed') is -1
if data.message.indexOf('certificate') is -1
@showSlide('js-discover')
@showAlert('js-discover', data.message)
else