JC Brand 94c135a6d8 Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default ... Conflicts: converse.js Fixes #102		2014-02-12 12:52:57 +02:00
..
doctrees	Add API method to retrieve the SID. Fixes #93	2014-02-12 12:37:39 +02:00
html	Add API method to retrieve the SID. Fixes #93	2014-02-12 12:37:39 +02:00
source	Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default	2014-02-12 12:52:57 +02:00
API.rst	Document the API methods we'll need. Updates #46, Updates #87	2013-11-24 16:23:37 +02:00
CHANGES.rst	Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default	2014-02-12 12:52:57 +02:00
DEVELOPER.rst	Finally figured out the subscription='from' ask='subscribe' thing	2013-11-06 19:38:16 +02:00
LICENSE_GPL.txt	Move licenses to docs dir	2013-10-20 21:48:36 +02:00
LICENSE_MIT.txt	Move licenses to docs dir	2013-10-20 21:48:36 +02:00
RELEASE_CHECKLIST.txt	Regenerated docs (new version number). Add release checklist	2013-09-15 21:37:56 +02:00