merge master

This commit is contained in:
Neil Lalonde
2016-03-31 17:33:25 -04:00
parent 95f2ac6535
commit 01d0aeb5a9
6371 changed files with 86540 additions and 60860 deletions

View File

@ -16,9 +16,7 @@
{ "path": "script" },
{ "path": "spec" },
{ "path": "vendor" },
{ "path": "test",
"folder_exclude_patterns": ["fixtures"]
}
{ "path": "test" },
],
"settings":
{