From: Scott Worley Date: Fri, 3 Aug 2012 01:38:31 +0000 (-0700) Subject: Merge skitch's changes. X-Git-Url: http://git.scottworley.com/reliable-chat/commitdiff_plain/99c1f307f81cc3d92541e41bab1df1f79d83517e?hp=79ced6f1d611919e0068ac2e7e8855d873f9e677 Merge skitch's changes. Conflicts: webclient/rc.html --- diff --git a/webclient/rc.html b/webclient/rc.html index 8aeae37..b3109a9 100644 --- a/webclient/rc.html +++ b/webclient/rc.html @@ -5,15 +5,59 @@ Reliable Chat