Merge branch 'dev' into test

fd6ceddf · liuzheng712 · e4867497 · 20d4bebc · fd6ceddf
Unverified Commit fd6ceddf authored Jan 25, 2018 by liuzheng712
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

iframe.component.ts src/app/elements/iframe/iframe.component.ts +1 -1

No files found.
--- a/src/app/elements/iframe/iframe.component.ts
+++ b/src/app/elements/iframe/iframe.component.ts
@@ -18,7 +18,7 @@ export class ElementIframeComponent implements OnInit {

  ngOnInit() {
    this.target = document.location.origin +
-      '/api/tokens?username=liu&password=zheng&asset_id=' +
+      '/guacamole/api/tokens?username=liu&password=zheng&asset_id=' +
      this.host.id + '&system_user_id=' + this.userid;
  }