• JC Brand's avatar
    Merge branch '0.6.x' · e4c9fcbc
    JC Brand authored
    Conflicts:
    	converse.css
    	converse.js
    	index.html
    
    Add allow_muc config option
    e4c9fcbc
index.html 11 KB