fix conflict

2025-10-31 05:31:10 -04:00 · 2019-11-14 19:46:55 +05:30
parent 0eb4d91086 b610577e79
commit 21cc2d7674
23 changed files with 185 additions and 59 deletions
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@ -62,6 +62,7 @@
            :invalid="$v.mailConfigData.mail_password.$error"
            v-model.trim="mailConfigData.mail_password"
            type="password"
+            show-password
            name="name"
            @input="$v.mailConfigData.mail_password.$touch()"
          />