diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-01-27 15:44:27 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-01-27 15:44:27 +0100 |
| commit | 577812bbdbd32e239c9e136c420cada6fe6d25f1 (patch) | |
| tree | f7b9c54551ec5851353e7145d8cd9f2682e337d3 | |
| parent | 6e073cf040c3376ad191a7621301ec7f10ce71eb (diff) | |
| parent | 24f451a4450e6fc8e264c688dfc6e3c1cc0e38fb (diff) | |
| download | mullvadvpn-577812bbdbd32e239c9e136c420cada6fe6d25f1.tar.xz mullvadvpn-577812bbdbd32e239c9e136c420cada6fe6d25f1.zip | |
Merge branch 'rename-changes-file'
| -rw-r--r-- | gui/changes.txt (renamed from gui/changelog.txt) | 0 | ||||
| -rw-r--r-- | gui/src/main/changelog.ts | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/gui/changelog.txt b/gui/changes.txt index 20fab22b44..20fab22b44 100644 --- a/gui/changelog.txt +++ b/gui/changes.txt diff --git a/gui/src/main/changelog.ts b/gui/src/main/changelog.ts index 4c169b055b..76fead30af 100644 --- a/gui/src/main/changelog.ts +++ b/gui/src/main/changelog.ts @@ -6,7 +6,7 @@ import log from '../shared/logging'; // Reads and parses the changelog file. export function readChangelog(): IChangelog { try { - const changelogPath = path.join(__dirname, '..', '..', '..', 'changelog.txt'); + const changelogPath = path.join(__dirname, '..', '..', '..', 'changes.txt'); const contents = fs.readFileSync(changelogPath).toString(); return parseChangelog(contents); } catch (e) { diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 798883b0ad..f0eb41de67 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -35,7 +35,7 @@ const config = { files: [ 'package.json', - 'changelog.txt', + 'changes.txt', 'init.js', 'build/', '!build/src/renderer', |