common.js
5.13 KB
-
Merge branch 'feature/add_user_in_collaboration' into debug/console_logs · c9e99c56
# Conflicts: # public_new/js/sockets/chat-websocket-message.js # public_new/js/views/collaboration/collaboration-add-user.js # public_new/js/views/collaboration/share-event-listener.js
Kim Peace committed