chat-room.js
7.58 KB
-
Merge branch 'bug/#43889_namecard_and_favorite' into debug/console_logs · 6fd316f9
# Conflicts: # public_new/js/views/collaboration/collaboration.js # public_new/js/views/collaboration/share-event-listener.js # public_new/js/views/contact/namecard.js
Kim Peace committed