Permalink
Browse files

Merge branch 'master' of github.com:alibby/ws-chat

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 5b46264 + 3ece261 commit fe26d01672d94f90660c5cad45191939336c1c15 Andrew Libby committed May 11, 2012
Showing with 22 additions and 0 deletions.
  1. +18 −0 .gitignore
  2. +4 −0 README.md
View
@@ -1,2 +1,20 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
.*.swp
+
View
@@ -0,0 +1,4 @@
+ws-chat
+=======
+
+First crack at some web sockets code with Ruby/ Sinatra/ em-websockets

0 comments on commit fe26d01

Please sign in to comment.