Browse Source

Merge branch '0.6.x'

Conflicts:
	Gruntfile.js
	converse.min.js
JC Brand 11 years ago
parent
commit
86521d0076
1 changed files with 0 additions and 0 deletions
  1. 0 0
      converse.min.js

File diff suppressed because it is too large
+ 0 - 0
converse.min.js


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