Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
47bac92f
Commit
47bac92f
authored
Oct 04, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0.6.x'
Conflicts: README.rst converse.js
parents
646fcb36
feb87bc8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
README.rst
README.rst
+1
-1
No files found.
README.rst
View file @
47bac92f
...
...
@@ -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>`_)
-----------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment