diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-11-28 20:51:17 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-11-28 20:51:17 +0100 |
| commit | 8b648553a115ed753f78bb81af2752eadaf47754 (patch) | |
| tree | b56cfd517a836dffa6b738896df125940f9936b8 /src/models/Service.js | |
| parent | fix(App): App menu was not initialized on app launch. Resolving copy & paste ... (diff) | |
| parent | Fix linting issues (diff) | |
| download | ferdium-app-8b648553a115ed753f78bb81af2752eadaf47754.tar.gz ferdium-app-8b648553a115ed753f78bb81af2752eadaf47754.tar.zst ferdium-app-8b648553a115ed753f78bb81af2752eadaf47754.zip | |
Merge branch 'update/monetization' into develop
Diffstat (limited to 'src/models/Service.js')
| -rw-r--r-- | src/models/Service.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/models/Service.js b/src/models/Service.js index 1bab8bd68..41180dd76 100644 --- a/src/models/Service.js +++ b/src/models/Service.js | |||
| @@ -69,6 +69,8 @@ export default class Service { | |||
| 69 | 69 | ||
| 70 | this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon; | 70 | this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon; |
| 71 | 71 | ||
| 72 | this.proxy = data.proxy !== undefined ? data.proxy : this.proxy; | ||
| 73 | |||
| 72 | this.recipe = recipe; | 74 | this.recipe = recipe; |
| 73 | 75 | ||
| 74 | autorun(() => { | 76 | autorun(() => { |