JC Brand 8e5d481e1c Merge branch 'auto-away' of https://github.com/thierrytiti/converse.js into thierrytiti-auto-away ... Conflicts: converse.js		2015-05-27 20:01:22 +02:00
..
source	Merge branch 'auto-away' of https://github.com/thierrytiti/converse.js into thierrytiti-auto-away	2015-05-27 20:01:22 +02:00
.gitattributes	Merge branch 'master' into amd-strophe	2015-02-22 12:53:18 +01: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 'auto-away' of https://github.com/thierrytiti/converse.js into thierrytiti-auto-away	2015-05-27 20:01:22 +02:00
DEVELOPER.rst	Bugfix. Handle case where user accepts request.	2014-07-23 19:11:29 +02:00
LICENSE.txt	Update contributors text, readme and add new license (MPL)	2014-03-22 02:11:34 +02:00
RELEASE_CHECKLIST.txt	Regenerated docs (new version number). Add release checklist	2013-09-15 21:37:56 +02:00