Merge branch 'master' into now

This commit is contained in:
Kevin Ewing 2013-06-19 15:39:06 -07:00
commit a469a1dae7

View File

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