Merge branch 'master' into dev

Unity-Technologies · Feb 28, 2018 · 0fde48c · 0fde48c
2 parents 5e91c15 + d8d6baa
commit 0fde48c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
+artifacts/**
+build/**
+Documentation/ApiDocs/**
+.DS_Store
 .npmrc
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,5 @@
+artifacts/**
+build/**
 Documentation/ApiDocs/**
 .npmrc
 .npmignore