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?ds=sidebyside;hp=-c Merge skitch's changes. Conflicts: webclient/rc.html --- 99c1f307f81cc3d92541e41bab1df1f79d83517e diff --combined webclient/rc.html index 8aeae37,9460159..b3109a9 --- a/webclient/rc.html +++ b/webclient/rc.html @@@ -5,21 -5,64 +5,65 @@@ Reliable Chat @@@ -169,12 -211,15 +224,15 @@@ - - - - -
 
- -
+
+
+
+
+
+ +
+
 
+
+