Permalink
Browse files

Merge branch 'master' of github.com:socketstream/socketstream

  • Loading branch information...
2 parents d538adb + 64248cf commit e9596bdbc039ee124ab80be17a91604c32d7ba2d Owen Barnes committed Aug 6, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 new_project/.gitignore
View
@@ -1,5 +1,6 @@
.DS_Store
+node_modules
dump.rdb
npm-debug.log
tmp
-public/assets
+client/static/assets

0 comments on commit e9596bd

Please sign in to comment.