Merge pull request #2594 from salesforce-ux/merge-summer-17-into-wint…

…er-18 Merge summer 17 into winter 18
salesforce-ux · Jul 24, 2017 · 3866d93 · 3866d93
2 parents db06fa2 + f49f543
commit 3866d93
Show file tree

Hide file tree

Showing 9 changed files with 15,212 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,8 @@
 # directory to check it in the repository
 !.gitkeep
 
+*snap.json
+
 # Ignore generated styles
 /assets/styles