Merge branch 'master' into raf

This commit is contained in:
Ian Gilman 2013-06-19 11:52:13 -07:00
commit 0b5ddd0d55

View File

@ -15,6 +15,7 @@
"settings": "settings":
{ {
"tab_size": 4, "tab_size": 4,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true,
"trim_trailing_white_space_on_save": true
} }
} }