Browse Source

Merge branch 'refs/heads/master' into develop

Emanuele Marchi 11 years ago
parent
commit
a79c04ba99
1 changed files with 1 additions and 0 deletions
  1. 1 0
      .gitignore

+ 1 - 0
.gitignore

@@ -2,3 +2,4 @@
 npm-debug.log
 node_modules
 bower_components
+.DS_Store