Merge branch 'dev' into github-code-theme

Conflicts:
	Rakefile
This commit is contained in:
Jon Rohan
2013-02-01 14:28:23 -05:00
11 changed files with 253 additions and 3 deletions

11
.atom/config.json Normal file
View File

@@ -0,0 +1,11 @@
{
"editor": {
"fontSize": 16
},
"core": {
"themes": [
"Atom - Dark",
"IR_Black"
]
}
}

1
.atom/themes/README.md Normal file
View File

@@ -0,0 +1 @@
All themes in this directory will be automatically loaded

View File

@@ -1,8 +1,8 @@
// User styles
/* User styles */
.tree-view {
}
.editor {
}
}