Merge branch 'master-hansa-05072018' into 'master-patch-july-2018'

[IMP]: Added Upstream patch for Mail See merge request flectra-hq/flectra!101
2018-07-13 12:18:43 +00:00 · 2018-07-13 12:18:43 +00:00 · 67a50b29b4
parent e313b2a500 ff1e80988b
commit 67a50b29b4
1 changed files with 1 additions and 0 deletions
--- a/addons/mail/static/src/js/utils.js
+++ b/addons/mail/static/src/js/utils.js
@ -112,6 +112,7 @@ function parse_email (text) {
        }
        return [text, false];
    }
+}
  /*  result = text.match(/(.*@.*)/);
    if (result) {
        return [_.str.trim(result[1]), _.str.trim(result[1])];