Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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

JC Brand 7 years ago
parent
4127d1126b
commit
fad6b5368d
1 changed files with 280 additions and 6220 deletions
Split View Show Diff Stats
  1. 280 6220
      dist/converse.js

File diff suppressed because it is too large
+ 280 - 6220
dist/converse.js


Some files were not shown because too many files changed in this diff