summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-04 09:39:52 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-12-04 09:39:52 +0100
commita0248940c142d8ddee8ffa3c3ad6ce9905814657 (patch)
treec7ab4e9af8bbeba0ae6f8ca209c82f03089ac482
parent556f5e17fb87eb4445610d6601b4ee3432924217 (diff)
parent95af72e575f924db54a96c81729c0c3f9feb9079 (diff)
downloadmullvadvpn-a0248940c142d8ddee8ffa3c3ad6ce9905814657.tar.xz
mullvadvpn-a0248940c142d8ddee8ffa3c3ad6ce9905814657.zip
Merge branch 'bundle-changelog'
-rw-r--r--electron-builder.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/electron-builder.yml b/electron-builder.yml
index 760c58a277..37b23c2c44 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -14,6 +14,8 @@ extraResources:
to: .
- from: dist-assets/relays.json
to: .
+ - from: ../talpid_core/CHANGELOG.md
+ to: .
directories:
buildResources: dist-assets/