github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Max Brunsfeld
2015-10-29 14:35:40 -07:00
parent 31c5a2e7d6 94b98bb716
commit 69dfdd0745
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Gruntfile.coffee
View File

@@ -256,7 +256,7 @@ module.exports = (grunt) ->
loadingGif: path.resolve(__dirname, '..', 'resources', 'win', 'loading.gif')
iconUrl: "https://raw.githubusercontent.com/atom/atom/master/resources/app-icons/#{channel}/atom.ico"
setupIcon: path.resolve(__dirname, '..', 'resources', 'app-icons', channel, 'atom.ico')
remoteReleases: 'https://atom.io/api/updates'
remoteReleases: "https://atom.io/api/updates?version=#{metadata.version}"
shell:
'kill-atom':