Merge branch 'frame-url' into user_controller_tests

Author: lenart

src/Controllers/UserController.js

@@ -221,6 +221,7 @@ function buildEmailLink(destination, username, token, config) {
 
   if (config.parseFrameURL) {
     const destinationWithoutHost = destination.replace(config.publicServerURL, '');
+
     return `${config.parseFrameURL}?link=${encodeURIComponent(destinationWithoutHost)}&${usernameAndToken}`;
   } else {
     return `${destination}?${usernameAndToken}`;