Merge 8cd90ee into 0fbad7f

dadi · Jul 9, 2018 · 36ecd86 · 36ecd86
2 parents 0fbad7f + 8cd90ee
commit 36ecd86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9,552 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+package-lock.json
 
 # Config
 config.development.json
@@ -23,4 +24,4 @@ persist
 public/**/*
 
 workspace/_exif/*
-workspace/_tmp/*
+workspace/_tmp/*