collaboration.js
3.87 KB
-
Merge branch 'develop' into refactoring/prettier · 2f0d9078
# Conflicts: # public_new/js/chat-ui.js # public_new/js/collaboration.js # public_new/js/share.js
Kim Peace committed
# Conflicts: # public_new/js/chat-ui.js # public_new/js/collaboration.js # public_new/js/share.js