Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch '0.6.x'

Browse Source 
Conflicts:
	README.rst
	converse.js
This commit is contained in:
JC Brand 2013-10-04 09:04:39 +02:00
commit 47bac92f2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -31,7 +31,7 @@ It has the following features:
* Custom status messages * Custom status messages
* Typing notifications * Typing notifications
* Third person messages (/me ) * Third person messages (/me )
* Translated into multiple languages (af, de, es, it, pt_BR) * Translated into multiple languages (af, de, es, fr, it, hu, pt-BR, ru)
* Off-the-record encryption support (via `OTR.js <http://arlolra.github.io/otr>`_) * Off-the-record encryption support (via `OTR.js <http://arlolra.github.io/otr>`_)
----------- -----------