Skip to content

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

Merge branch '0.6.x' 

Conflicts:
	Gruntfile.js
	converse.min.js
parents 37f2f8ca 1b1bac22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
converse.min.js
View file @ 86521d00
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