Merge branch 'master' of https://github.com/ncik-roberts/Wobtranslate

Conflicts: .gitignore api/wobapi.js package.json
ncik-roberts · Aug 26, 2016 · 7d72434 · 7d72434
2 parents 36ac0e5 + 545900b
commit 7d72434
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-server/node_modules/
+server/node_modules/*