1
0
mirror of https://github.com/balkian/hook.io-web40.git synced 2025-01-05 02:41:30 +00:00

Merge branch 'master' of github.com:balkian/hook.io-web40

Conflicts:
	.gitignore
This commit is contained in:
J.Fernando Sánchez 2012-05-25 11:25:26 +02:00
commit bfb6d73cd2
2 changed files with 16 additions and 0 deletions

14
.gitignore vendored
View File

@ -4,3 +4,17 @@ node_modules
*.bak
*.swp
SOJA
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz
pids
logs
results
npm-debug.log

2
README.md Normal file
View File

@ -0,0 +1,2 @@
hook.io-web40
=============