JC Brand 1dff3ac002 Merge branch '0.8' ... Conflicts: CONTRIBUTING.rst Makefile README.rst bower.json docs/CHANGES.rst docs/doctrees/index.doctree docs/html/_sources/index.txt docs/html/index.html docs/html/searchindex.js docs/source/index.rst		2014-04-19 07:05:00 +02:00
..
doctrees	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
html	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
source	Add support for XEP-0280 Message Carbons. updates #132	2014-04-19 06:58:26 +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	Add support for XEP-0280 Message Carbons. updates #132	2014-04-19 06:58:26 +02:00
DEVELOPER.rst	Finally figured out the subscription='from' ask='subscribe' thing	2013-11-06 19:38:16 +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