JC Brand 9849daacf9 Merge branch 'master' into 0.8 ... Conflicts: bower.json converse.js docs/CHANGES.rst spec/chatbox.js tests/utils.js tests_main.js		2014-03-09 08:18:00 +02:00
..
doctrees	Added a section to the documentation concerning OTR	2014-02-12 19:32:25 +02:00
html	Release version 0.7.4	2014-03-05 08:44:01 +02:00
source	Merge branch 'master' into 0.8	2014-03-09 08:18:00 +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 'master' into 0.8	2014-03-09 08:18:00 +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