Commit 82d354a1 authored by Tanner Grehawick's avatar Tanner Grehawick

Merge branch 'master' into charanim

parents fad88ade f577e1fe
......@@ -2,9 +2,6 @@
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment