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
..
_templates	Add a custom sphinx theme	2013-04-26 21:49:26 +02:00
theme	Update docs to mention new way to minify. Fixes #39	2013-08-20 22:53:19 +02:00
conf.py	New release 0.7.2	2013-12-18 17:07:11 +02:00
index.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