Merge branch '0.6.x'

Conflicts: README.rst converse.js

Merge branch '0.6.x'
Conflicts: README.rst converse.js
47bac92f · JC Brand · 646fcb36 · feb87bc8 · 47bac92f
Commit 47bac92f authored Oct 04, 2013 by JC Brand
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

README.rst README.rst +1 -1

No files found.
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ It has the following features:
 * Custom status messages
 * Typing notifications
 * 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>`_)

 -----------