From a33757c5f7ff198fa4c57baaffe7f995227efa89 Mon Sep 17 00:00:00 2001
From: Daniel Hengeveld <danielwh@gmail.com>
Date: Wed, 11 May 2016 13:57:51 +0200
Subject: [PATCH 1/2] attach msi to release

---
 build/tasks/publish-build-task.coffee | 2 +-
 spec/fixtures/sample.txt              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index 19061db02..0a18c9c23 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -74,7 +74,7 @@ getAssets = ->
       ]
     when 'win32'
       assets = [{assetName: 'atom-windows.zip', sourcePath: appName}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
+      for squirrelAsset in ['AtomSetup.exe', 'AtomSetup.msi', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
         cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
         assets.push({assetName: squirrelAsset, sourcePath: assetName})
       assets
diff --git a/spec/fixtures/sample.txt b/spec/fixtures/sample.txt
index 9701a96c5..0a2b6a502 100644
--- a/spec/fixtures/sample.txt
+++ b/spec/fixtures/sample.txt
@@ -1 +1 @@
-Some textSome textSome text.
+Some textSome textSome textSome text.

From aebacfcfc64d89457ac14e3f5a17f299563ab185 Mon Sep 17 00:00:00 2001
From: Daniel Hengeveld <danielwh@gmail.com>
Date: Wed, 11 May 2016 17:05:43 +0200
Subject: [PATCH 2/2] not sure how that got in there

---
 spec/fixtures/sample.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/fixtures/sample.txt b/spec/fixtures/sample.txt
index 0a2b6a502..9701a96c5 100644
--- a/spec/fixtures/sample.txt
+++ b/spec/fixtures/sample.txt
@@ -1 +1 @@
-Some textSome textSome textSome text.
+Some textSome textSome text.