diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
| commit | b6469566c2c88e8a61334d5d15a0f7c1afe08288 (patch) | |
| tree | f42dd4962c74057c6432866205b16c9d78a1c07e /src/config.js | |
| parent | remove dev logs (diff) | |
| parent | correctly update services submenu on language change (diff) | |
| download | ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.gz ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.zst ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'src/config.js')
| -rw-r--r-- | src/config.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/config.js b/src/config.js index 30a5a5cc0..d619a7492 100644 --- a/src/config.js +++ b/src/config.js | |||
| @@ -64,3 +64,9 @@ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); | |||
| 64 | 64 | ||
| 65 | // Replacing app.asar is not beautiful but unforunately necessary | 65 | // Replacing app.asar is not beautiful but unforunately necessary |
| 66 | export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); | 66 | export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); |
| 67 | |||
| 68 | export const ALLOWED_PROTOCOLS = [ | ||
| 69 | 'https:', | ||
| 70 | 'http:', | ||
| 71 | 'ftp:', | ||
| 72 | ]; | ||