diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
| commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
| tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/components/ui/SubscriptionPopup.js | |
| parent | Sort languages by name (diff) | |
| parent | Add color to service icons (diff) | |
| download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip | |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/components/ui/SubscriptionPopup.js')
| -rw-r--r-- | src/components/ui/SubscriptionPopup.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js index 5aae2c47a..528d02907 100644 --- a/src/components/ui/SubscriptionPopup.js +++ b/src/components/ui/SubscriptionPopup.js | |||
| @@ -58,7 +58,6 @@ export default class SubscriptionPopup extends Component { | |||
| 58 | 58 | ||
| 59 | autosize | 59 | autosize |
| 60 | src={encodeURI(url)} | 60 | src={encodeURI(url)} |
| 61 | disablewebsecurity | ||
| 62 | onDidNavigate={completeCheck} | 61 | onDidNavigate={completeCheck} |
| 63 | // onNewWindow={(event, url, frameName, options) => | 62 | // onNewWindow={(event, url, frameName, options) => |
| 64 | // openWindow({ event, url, frameName, options })} | 63 | // openWindow({ event, url, frameName, options })} |