github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 09:35:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cj-warn-deprecations

Browse Source 
Conflicts:
	package.json
This commit is contained in:
probablycorey
2014-04-04 14:43:54 -07:00
parent e58c2d8368 665088ce27
commit 59108322e7
39 changed files with 220 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/workspace.coffee
View File

@@ -34,7 +34,7 @@ class Workspace extends Model
when 'atom://.atom/stylesheet'
@open(atom.themes.getUserStylesheetPath())
when 'atom://.atom/keymap'
@open(atom.keymap.getUserKeymapPath())
@open(atom.keymaps.getUserKeymapPath())
when 'atom://.atom/config'
@open(atom.config.getUserConfigPath())
when 'atom://.atom/init-script'