Skip to content

C
converse.js
Commit fad6b536 authored by JC Brand's avatar JC Brand
Browse files
Options

Fix incorrect merge (from master into converse-omemo branch)

parent 4127d112
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1067 additions and 6684 deletions
dist/converse.js
View file @ fad6b536
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7