merging

pengying · Aug 8, 2011 · 4d47f1a · 4d47f1a
2 parents 6a8258a + 787d22c
commit 4d47f1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/app/js/script.js b/app/js/script.js
@@ -284,7 +284,7 @@ var changeAvatar = function(avatar){
   var data = {
     id: myAvatar.data-profile-id,
     action: 'changeAvatar',
-    newAvatar: Avatars[avatar],
+    newAvatar: Avatars[avatar]
   };
   document.querySelector('#chat-window iframe').contentWindow.postMessage(
       data, document.location.origin);

diff --git a/app/tmp/34b3b4d3506ba6043eedc971682704fe.mp3 b/app/tmp/34b3b4d3506ba6043eedc971682704fe.mp3